diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
| commit | b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e (patch) | |
| tree | 6078ccc55d5298796c3f626fb4886a131b833e37 /sql/wsrep_mysqld.cc | |
| parent | e14ffd85d09a62d098d3db9597fd34bf3d4c4fe3 (diff) | |
| parent | 187b9c924ebaff8f02fb4e2139a01fd1512e3dc9 (diff) | |
| download | mariadb-git-b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e.tar.gz | |
Merge 10.2 into 10.3
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 6d7099375b5..cfba0ace2cb 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1603,7 +1603,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)) @@ -1612,6 +1611,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)) { |