diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-05 18:32:37 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-05 18:32:37 +0200 |
| commit | 5f55f69e4a237deb98cd4fc7d6ea9a17a8fe63bb (patch) | |
| tree | d9031bb02e1807d0324b9f802dcf72eb8e3768a6 /sql/wsrep_mysqld.cc | |
| parent | efc70da5fd0459ff44153529d13651741cc32bc4 (diff) | |
| parent | 3f019d1771d4e6e21f941b72a83e0663f15b376f (diff) | |
| download | mariadb-git-5f55f69e4a237deb98cd4fc7d6ea9a17a8fe63bb.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index af50699af59..f95ef168a23 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1612,7 +1612,6 @@ static bool wsrep_can_run_in_toi(THD *thd, const char *db, const char *table, case SQLCOM_CREATE_TRIGGER: - DBUG_ASSERT(!table_list); DBUG_ASSERT(first_table); if (thd->find_temporary_table(first_table)) @@ -1621,6 +1620,14 @@ static bool wsrep_can_run_in_toi(THD *thd, const char *db, const char *table, } return true; + case SQLCOM_DROP_TRIGGER: + DBUG_ASSERT(table_list); + if (thd->find_temporary_table(table_list)) + { + return false; + } + return true; + default: if (table && !thd->find_temporary_table(db, table)) { |