summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorram@gw.mysql.r18.ru <>2005-01-25 11:06:12 +0400
committerram@gw.mysql.r18.ru <>2005-01-25 11:06:12 +0400
commit8c043a299bc7b8f4170cbdf3197ebc546eeb57e4 (patch)
treed32ed658f26932bbe81346aacbb01560d584ea7f /sql/sql_table.cc
parent7454f2f09769665afd59c53b49e1bf62454f0672 (diff)
parent35b521c9259ccda523c36170de2a3eae1794265a (diff)
downloadmariadb-git-8c043a299bc7b8f4170cbdf3197ebc546eeb57e4.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5d756653cdd..423a309767b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3231,7 +3231,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
/* 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_alias))
+ /* Should pass the 'new_name' as we store table name in the cache */
+ if (rename_temporary_table(thd, new_table, new_db, new_name))
{ // Fatal error
close_temporary_table(thd,new_db,tmp_name);
my_free((gptr) new_table,MYF(0));