Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index cf788cee05f..725aed390be 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1509,6 +1509,12 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
       my_free((gptr) new_table,MYF(0));
       goto err;
     }
+    /* Close lock if this is a transactional table */
+    if (thd->lock)
+    {
+      mysql_unlock_tables(thd, thd->lock);
+      thd->lock=0;
+    }
     /* Remove link to old table and rename the new one */
     close_temporary_table(thd,table->table_cache_key,table_name);
     if (rename_temporary_table(thd, new_table, new_db, new_name))