summaryrefslogtreecommitdiff
path: root/sql/sql_rename.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-12-17 16:25:15 +0400
committerSergey Vojtovich <svoj@mariadb.org>2020-04-03 13:01:21 +0400
commit7a947614fbf8b925ae3df70ec8df80c745eafd4c (patch)
treed462b7218559c2e7855a6019ffc382f003f1f889 /sql/sql_rename.cc
parent06fae75859821fe36f68eb2d77f007f014143282 (diff)
downloadmariadb-git-7a947614fbf8b925ae3df70ec8df80c745eafd4c.tar.gz
Split tdc_remove_table()
TDC_RT_REMOVE_ALL -> tdc_remove_table(). Some occurrences replaced with TDC_element::flush() (whenver TABLE_SHARE is available). TDC_RT_REMOVE_NOT_OWN[_KEEP_SHARE] -> TDC_element::flush(). These modes assume that current thread owns TABLE_SHARE reference, which means we can avoid hash lookup and flush unused TABLE instances directly. TDC_RT_REMOVE_UNUSED -> TDC_element::flush_unused(). Only [ab]used by mysql_admin_table() currently. Should be removed eventually. Part of MDEV-17882 - Cleanup refresh version
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r--sql/sql_rename.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 8d125fbfa06..0200113deae 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -309,8 +309,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, const LEX_CSTRING *new_db,
Shared table. Just drop the old .frm as it's not correct anymore
Discovery will find the old table when it's accessed
*/
- tdc_remove_table(thd, TDC_RT_REMOVE_ALL,
- ren_table->db.str, ren_table->table_name.str);
+ tdc_remove_table(thd, ren_table->db.str, ren_table->table_name.str);
quick_rm_table(thd, 0, &ren_table->db, &old_alias, FRM_ONLY, 0);
DBUG_RETURN(0);
}
@@ -329,8 +328,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, const LEX_CSTRING *new_db,
DBUG_RETURN(1);
#endif
- tdc_remove_table(thd, TDC_RT_REMOVE_ALL,
- ren_table->db.str, ren_table->table_name.str);
+ tdc_remove_table(thd, ren_table->db.str, ren_table->table_name.str);
if (hton != view_pseudo_hton)
{