database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Auto-merge from mysql-5.1-bugteam for bug#47924.

Browse Source
This commit is contained in:
Dmitry Shulga
2010-11-08 00:06:22 +06:00
parent 5b8dbe96a5 8f237f5874
commit 7cd6bb2645
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_rename.cc
View File

@ -108,7 +108,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
*/
my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
ren_table->table_name);
DBUG_RETURN(1);
goto err;
}
}
else
@ -121,7 +121,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
*/
my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
ren_table->table_name);
DBUG_RETURN(1);
goto err;
}
else
{
@ -139,7 +139,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
else
my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), rename_log_table[1],
rename_log_table[1]);
DBUG_RETURN(1);
goto err;
}
}