Added CF_HA_CLOSE flag for RENAME_TABLE

an3l · an3l · commit bdeafec4bda1 · 2018-06-05T13:35:43.000Z
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -825,6 +825,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
@@ -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))
   {

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,6 @@ bool mysql_rename_tables(THD thd, TABLE_LIST table_list, bool silent)`
`65`	`65`	`DBUG_RETURN(1);`
`66`	`66`	`}`
`67`	`67`
`68`		`- mysql_ha_rm_tables(thd, table_list);`
`69`		`-`
`70`	`68`	`if (logger.is_log_table_enabled(QUERY_LOG_GENERAL) \|\|`
`71`	`69`	`logger.is_log_table_enabled(QUERY_LOG_SLOW))`
`72`	`70`	`{`