diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2005-01-25 11:06:12 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2005-01-25 11:06:12 +0400 |
| commit | b6ad6a12a0d08645cf487dd5d81182f3eb91ec67 (patch) | |
| tree | d32ed658f26932bbe81346aacbb01560d584ea7f /sql/sql_table.cc | |
| parent | 4bb1c716e8f5d513f85b666a68ede0a112b12ca1 (diff) | |
| parent | b7b042689c566fc91a0c1ef2a2345ce964e6d191 (diff) | |
| download | mariadb-git-b6ad6a12a0d08645cf487dd5d81182f3eb91ec67.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
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
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)); |