summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2018-06-05 13:35:43 +0000
committerAnel Husakovic <anel@mariadb.org>2020-02-25 15:57:50 +0100
commita812281c66267a6ee6b2e4a417cc80b3aed7f1df (patch)
tree6e1cc3ed13f8a189b88b7acb3d569fcda03e2661
parenta662cb9b4329abc6f3895fed97c80434e8f78b20 (diff)
downloadmariadb-git-bb-10.3-anel-PR802.tar.gz
Added CF_HA_CLOSE flag for RENAME_TABLEbb-10.3-anel-PR802
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/sql_rename.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 59b4e148005..c29c2560fe6 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -835,6 +835,8 @@ void init_update_queries(void)
sql_command_flags[SQLCOM_DROP_INDEX]|= CF_HA_CLOSE;
sql_command_flags[SQLCOM_PRELOAD_KEYS]|= CF_HA_CLOSE;
sql_command_flags[SQLCOM_ASSIGN_TO_KEYCACHE]|= CF_HA_CLOSE;
+ sql_command_flags[SQLCOM_RENAME_TABLE]|= CF_HA_CLOSE;
+
/*
Mark statements that always are disallowed in read-only
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index ada373546be..8d8336220be 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -65,8 +65,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
DBUG_RETURN(1);
}
- mysql_ha_rm_tables(thd, table_list);
-
if (logger.is_log_table_enabled(QUERY_LOG_GENERAL) ||
logger.is_log_table_enabled(QUERY_LOG_SLOW))
{