diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
| commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
| tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /sql/sql_trigger.cc | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 303c5d75e18..0fefe7d2c52 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1,5 +1,6 @@ /* Copyright (c) 2004, 2012, Oracle and/or its affiliates. + Copyright (c) 2010, 2018, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -587,7 +588,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(); /* |