diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
| commit | c3289d27eef39a47fed2ce1ff239013ed6870f39 (patch) | |
| tree | 2a6e2434287921eb6f5f7c7877e8da061803ed9e /sql/sql_trigger.cc | |
| parent | 358ae4b46dd52b329154cff901b58e96fd223773 (diff) | |
| parent | eaab98f7022732b26b4ea590e1bb44308e253be8 (diff) | |
| download | mariadb-git-c3289d27eef39a47fed2ce1ff239013ed6870f39.tar.gz | |
Merge mariadb-10.3.8 into 10.3
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index df3a2dc9c04..755a9a9486d 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -454,7 +454,6 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) my_error(ER_BINLOG_CREATE_ROUTINE_NEED_SUPER, MYF(0)); DBUG_RETURN(TRUE); } - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) if (!create) { @@ -516,6 +515,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) if (err_status) goto end; } + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); /* We should have only one table in table list. */ DBUG_ASSERT(tables->next_global == 0); |