diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ab649f2316048..611e196b18332 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -837,6 +837,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 0f7bb7748c100..d8cd02176c04d 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))
   {