diff options
| author | unknown <evgen@sunlight.local> | 2006-10-18 00:15:14 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-10-18 00:15:14 +0400 |
| commit | b18b419b5a99456be4746b92cedf3c7e4cdbae44 (patch) | |
| tree | ebe72b54162cf3c36e878aaaf250ba487bf1222a /sql | |
| parent | e2698fa7530fa000cb05cf6e253804788df67f68 (diff) | |
| parent | 3dccef3c30c66f4027da97a74b1d5ce4ff34ca62 (diff) | |
| download | mariadb-git-b18b419b5a99456be4746b92cedf3c7e4cdbae44.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into sunlight.local:/local_work/14959-bug-5.0-opt-mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_rename.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 1a4f1d82cb5..c87a8696bbc 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -173,7 +173,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db, char *new_table_name, if (!access(name,F_OK)) { my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias); - DBUG_RETURN(ren_table); // This can't be skipped + DBUG_RETURN(1); // This can't be skipped } sprintf(name,"%s/%s/%s%s",mysql_data_home, ren_table->db, old_alias, |