database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge tag 'mariadb-10.0.35' into 10.0-galera

Browse Source
This commit is contained in:
Jan Lindström
2018-05-07 17:20:39 +03:00
parent 648cf7176c 42fac32413
commit e1ffb66449
323 changed files with 5071 additions and 2905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_trigger.cc
View File

@ -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();
/*