diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2017-10-10 23:39:48 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-10-19 09:57:23 +0300 |
| commit | 8822b30f1e258a5f0efc124043f42970e600c5d4 (patch) | |
| tree | 1fe8b9d5d6a10338211dc0b085da009a7fced496 /sql/sql_trigger.cc | |
| parent | 38530c86aa36e2cbd315447a5362bcc751fb9205 (diff) | |
| download | mariadb-git-8822b30f1e258a5f0efc124043f42970e600c5d4.tar.gz | |
MW-416 Replicating DDL after ACL check, 5.6 version
Re-implemented the fix for MW-416 according to 5.7 version
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index c562ee9762c..70ed6f0e600 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -501,6 +501,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); @@ -605,6 +606,10 @@ end: my_ok(thd); DBUG_RETURN(result); +#ifdef WITH_WSREP + error: + DBUG_RETURN(TRUE); +#endif /* WITH_WSREP */ } |