diff options
| author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2010-11-08 00:06:22 +0600 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2010-11-08 00:06:22 +0600 |
| commit | 7cd6bb264557589fbe08fd3da944886bbab149ab (patch) | |
| tree | 6c4070690f1f0cb829b07c54bcc39e03e838802d /sql/sql_rename.cc | |
| parent | 5b8dbe96a566f4c304f3ebee7c2c4fcdd5793116 (diff) | |
| parent | 8f237f5874a814daaa7431748849997d1a2aa8ea (diff) | |
| download | mariadb-git-7cd6bb264557589fbe08fd3da944886bbab149ab.tar.gz | |
Auto-merge from mysql-5.1-bugteam for bug#47924.
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index ac15239b040..8f990eae001 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -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; } } |