summaryrefslogtreecommitdiff
path: root/sql/sql_rename.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-01-29 18:32:16 +0200
committermonty@hundin.mysql.fi <>2002-01-29 18:32:16 +0200
commitbe46289855f01c0d563671beb5135c22b7bad2aa (patch)
treedc6d00358536a5dca27f806f929ab5e25a000c92 /sql/sql_rename.cc
parente2a5c3e4cd331d9addc2342549e2c47ac7e9cb7a (diff)
downloadmariadb-git-be46289855f01c0d563671beb5135c22b7bad2aa.tar.gz
New error messages
Test of unsigned BIGINT values Fixes for queries-per-hour Cleanup of replication code (comments and portability fixes) Make most of the binary log code 4G clean Changed syntax for GRANT ... QUERIES PER HOUR
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r--sql/sql_rename.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index e4a277d1434..2c4c6216ab7 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)
if (!access(name,F_OK))
{
my_error(ER_TABLE_EXISTS_ERROR,MYF(0),name);
- return ren_table; // This can't be skipped
+ DBUG_RETURN(ren_table); // This can't be skipped
}
sprintf(name,"%s/%s/%s%s",mysql_data_home,
ren_table->db,ren_table->name,
@@ -138,7 +138,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
{
my_error(ER_FILE_NOT_FOUND, MYF(0), name, my_errno);
if (!skip_error)
- return ren_table;
+ DBUG_RETURN(ren_table);
}
else if (mysql_rename_table(table_type,
ren_table->db, ren_table->name,