summaryrefslogtreecommitdiff
path: root/sql/sql_rename.cc
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2002-03-21 23:06:48 +0200
committerunknown <monty@tik.mysql.fi>2002-03-21 23:06:48 +0200
commitc0a5e4707168e03e89191261b7a5ec95ffbc99d7 (patch)
tree63e54a056bcd09390054202f9c5fad2985ab8f2d /sql/sql_rename.cc
parentb70f53b28940008233995d885584c2e0984e3bf4 (diff)
downloadmariadb-git-c0a5e4707168e03e89191261b7a5ec95ffbc99d7.tar.gz
Quote names to SHOW CREATE for mysqldump
Fix thread-related bug when doing DROP TABLE Fix bug in RENAME TABLE on windows Docs/manual.texi: Changelog client/mysqldump.c: Quote names to SHOW CREATE mysql-test/t/range.test: Test case for range bug sql/lock.cc: Fix thread-related bug when doing DROP TABLE sql/sql_base.cc: Fix thread-related bug when doing DROP TABLE sql/sql_rename.cc: Fix bug in RENAME TABLE on windows
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r--sql/sql_rename.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 0f6e2f9fbf3..a6614f3f3f6 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -129,7 +129,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
new_table=ren_table->next;
sprintf(name,"%s/%s/%s%s",mysql_data_home,
- new_table->db,new_table->name,
+ new_table->db,new_table->real_name,
reg_ext);
if (!access(name,F_OK))
{
@@ -137,7 +137,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
return ren_table; // This can't be skipped
}
sprintf(name,"%s/%s/%s%s",mysql_data_home,
- ren_table->db,ren_table->name,
+ ren_table->db,ren_table->real_name,
reg_ext);
if ((table_type=get_table_type(name)) == DB_TYPE_UNKNOWN)
{
@@ -146,11 +146,11 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
return ren_table;
}
else if (mysql_rename_table(table_type,
- ren_table->db, ren_table->name,
- new_table->db, new_table->name))
+ ren_table->db, ren_table->real_name,
+ new_table->db, new_table->real_name))
{
if (!skip_error)
- return ren_table;
+ DBUG_RETURN(ren_table);
}
}
DBUG_RETURN(0);