diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
| commit | ae476868a5394041a00e75a29c7d45917e8dfae8 (patch) | |
| tree | b2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /sql/sql_table.cc | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| parent | 2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff) | |
| download | mariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 25bbaf23617..656834c7852 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2018, MariaDB + Copyright (c) 2000, 2019, Oracle and/or its affiliates. + Copyright (c) 2010, 2019, 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 @@ -2529,8 +2529,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, table->table_name);); } DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog"); - thd->thread_specific_used|= (trans_tmp_table_deleted || - non_trans_tmp_table_deleted); + thd->thread_specific_used= TRUE; error= 0; err: if (wrong_tables.length()) |