1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index ed109127e30..3c15aa827cd 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1170,6 +1170,12 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
       if (mysql_rename_table(old_db_type,db,table_name,new_db,new_name))
 	error= -1;
     }
+    if (!error && (error=ha_commit_rename(thd)))
+    {
+      my_error(ER_GET_ERRNO,MYF(0),error);
+      error=1;
+    }
+
     VOID(pthread_cond_broadcast(&COND_refresh));
     VOID(pthread_mutex_unlock(&LOCK_open));
     if (!error)
@@ -1603,6 +1609,7 @@ end_temporary:
   DBUG_RETURN(0);
 
  err:
+  (void) ha_commit_rename(thd);	// Just for safety
   DBUG_RETURN(-1);
 }