diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2018-09-12 16:36:45 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-10-02 13:42:44 +0400 |
commit | bad2f1569da57c4a81cc84ec2f4a79924df9c8d6 (patch) | |
tree | 9ec5b4596b163d275051f7de74736183a6c191c3 /sql/temporary_tables.cc | |
parent | b9a5ff364466d2d1495352dd6c932d877923a614 (diff) | |
download | mariadb-git-bad2f1569da57c4a81cc84ec2f4a79924df9c8d6.tar.gz |
MDEV-17167 - InnoDB: Failing assertion: table->get_ref_count() == 0 uponmariadb-10.3.10
truncating a temporary table
TRUNCATE expects only one TABLE instance (which is used by TRUNCATE
itself) to be open. However this requirement wasn't enforced after
"MDEV-5535: Cannot reopen temporary table".
Fixed by closing unused table instances before performing TRUNCATE.
Diffstat (limited to 'sql/temporary_tables.cc')
-rw-r--r-- | sql/temporary_tables.cc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc index f23ec7a1acc..1c8af5eaf66 100644 --- a/sql/temporary_tables.cc +++ b/sql/temporary_tables.cc @@ -1540,3 +1540,33 @@ void THD::unlock_temporary_tables() DBUG_VOID_RETURN; } + +/** + Close unused TABLE instances for given temporary table. + + @param tl [IN] TABLE_LIST + + Initial use case was TRUNCATE, which expects only one instance (which is used + by TRUNCATE itself) to be open. Most probably some ALTER TABLE variants and + REPAIR may have similar expectations. +*/ + +void THD::close_unused_temporary_table_instances(const TABLE_LIST *tl) +{ + TMP_TABLE_SHARE *share= find_tmp_table_share(tl); + + if (share) + { + All_share_tables_list::Iterator tables_it(share->all_tmp_tables); + + while (TABLE *table= tables_it++) + { + if (table->query_id == 0) + { + /* Note: removing current list element doesn't invalidate iterator. */ + share->all_tmp_tables.remove(table); + free_temporary_table(table); + } + } + } +} |