diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 12:58:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 12:58:11 +0200 |
| commit | 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (patch) | |
| tree | 0aa792118101ee3130b25b47316159aaccec52e2 /sql/sql_base.cc | |
| parent | 87dc4e98dda26ff99a3b3aeae2fce9fd2f2fdf24 (diff) | |
| parent | 1144acbcbdf9b7bdf18c31f88cbe859d99658b53 (diff) | |
| download | mariadb-git-1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index fecb5686541..c4b243e5aba 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -850,6 +850,7 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share, uint key_length= share->table_cache_key.length; const char *db= key; const char *table_name= db + share->db.length + 1; + bool remove_from_locked_tables= extra != HA_EXTRA_NOT_USED; memcpy(key, share->table_cache_key.str, key_length); @@ -863,7 +864,7 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share, { thd->locked_tables_list.unlink_from_list(thd, table->pos_in_locked_tables, - extra != HA_EXTRA_NOT_USED); + remove_from_locked_tables); /* Inform handler that there is a drop table or a rename going on */ if (extra != HA_EXTRA_NOT_USED && table->db_stat) { |