diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 22:42:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 22:42:35 +0200 |
| commit | d97342b6f2cfdd55eb0f82b390ebc89c5997c382 (patch) | |
| tree | 238dbb11c51a2352c99de198586b84f260b3aad9 /sql/sql_table.cc | |
| parent | 00a254cc069e77f2088f6fbf8c367f247cfdd0dc (diff) | |
| parent | 32c6f40a6319d493e5270c72ac5d27dc99d1b242 (diff) | |
| download | mariadb-git-d97342b6f2cfdd55eb0f82b390ebc89c5997c382.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 321b6f4124e..af2e686167c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. + 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 @@ -2574,8 +2574,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, table->table ? table->table->s : NULL)); } 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()) |