diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-03 14:17:16 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-03 14:17:16 +0200 |
| commit | e6f95309f8fb79f01de460ceebde61e022c644a6 (patch) | |
| tree | 4ea1d37372399259b92fa11f95a201670fc5c407 /sql/sql_trigger.cc | |
| parent | 40dbf0ea0e678370f4c34700e9868b3560cf8301 (diff) | |
| parent | 685e51f0e3b803e52ca42edcc9e090c4d5799185 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-22763.tar.gz | |
Merge branch 'codership-10.1-MDEV-22763' into bb-10.1-MDEV-22763bb-10.1-MDEV-22763
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index c4d348ce400..2972ceecd8a 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -34,7 +34,9 @@ #include "sql_handler.h" // mysql_ha_rm_tables #include "sp_cache.h" // sp_invalidate_cache #include <mysys_err.h> - +#ifdef WITH_WSREP +#include "debug_sync.h" +#endif /* WITH_WSREP */ /*************************************************************************/ template <class T> @@ -506,7 +508,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) #ifdef WITH_WSREP if (thd->wsrep_exec_mode == LOCAL_STATE) - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, tables); #endif /* We should have only one table in table list. */ @@ -568,6 +570,16 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) goto end; } +#ifdef WITH_WSREP + DBUG_EXECUTE_IF("sync.mdev_20225", + { + const char act[]= + "now " + "wait_for signal.mdev_20225_continue"; + DBUG_ASSERT(!debug_sync_set_action(thd, + STRING_WITH_LEN(act))); + };); +#endif /* WITH_WSREP */ result= (create ? table->triggers->create_trigger(thd, tables, &stmt_query): table->triggers->drop_trigger(thd, tables, &stmt_query)); |