diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 17:20:39 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 17:20:39 +0300 |
| commit | e1ffb66449efa44e99d51c2a01c51d1623342d62 (patch) | |
| tree | 7ce4e13ba915e8a6a0d50cc1adf7beacc8514a36 /sql/sql_trigger.cc | |
| parent | 648cf7176cc95f697abd8b94e860c74768680298 (diff) | |
| parent | 42fac3241368ad72f8cfef2b8521269e6c173558 (diff) | |
| download | mariadb-git-e1ffb66449efa44e99d51c2a01c51d1623342d62.tar.gz | |
Merge tag 'mariadb-10.0.35' into 10.0-galera
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 ec75fc2da12..34875824e2e 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -582,7 +582,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) Ignore the return value for now. It's better to keep master/slave in consistent state. */ - if (thd->locked_tables_list.reopen_tables(thd)) + if (thd->locked_tables_list.reopen_tables(thd, false)) thd->clear_error(); /* |