summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-06-10 17:37:12 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-06-10 17:37:12 +0400
commit7ecb304996df7d917ef1e857090a9a9c525160f1 (patch)
tree8dc86d3e7cd39c5be91ff9f983f187faca77cbcb /sql/sql_admin.cc
parent2dee76f4359d7e87cd7f4094892a2ed287dce1a8 (diff)
downloadmariadb-git-7ecb304996df7d917ef1e857090a9a9c525160f1.tar.gz
Code cleanups
- unused TABLE_SHARE::deleting and TABLE_LIST::deleting flags were removed - kill_delayed_threads_for_table() and intern_close_table() are now private methods of table cache - removed free_share flag of closefrm(): it was never used for temporary tables and was rarely useful for regular tables
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 205621c6f9f..5c400e44bc7 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -261,7 +261,10 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
end:
thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0);
if (table == &tmp_table)
- closefrm(table, 1); // Free allocated memory
+ {
+ closefrm(table);
+ tdc_release_share(table->s);
+ }
/* In case of a temporary table there will be no metadata lock. */
if (error && has_mdl_lock)
thd->mdl_context.release_transactional_locks();