diff options
| author | monty@hundin.mysql.fi <> | 2002-03-27 01:56:10 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-03-27 01:56:10 +0200 |
| commit | 727e507bca7fe9342f543340f9d7ea7a02e9708e (patch) | |
| tree | 6998f99b1790b678ac1558e748e2a8c992bbfa22 /sql/sql_rename.cc | |
| parent | ce541b292a20114adc5d5bb10142a441246e0675 (diff) | |
| parent | 3a571c7c135b9e9707e09ace4058d00ed6935fd1 (diff) | |
| download | mariadb-git-727e507bca7fe9342f543340f9d7ea7a02e9708e.tar.gz | |
merge with 3.23.50
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index f2a0351361b..305491c7346 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -126,7 +126,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)) { @@ -134,7 +134,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error) DBUG_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) { @@ -143,11 +143,11 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error) DBUG_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); |