diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
| commit | cf245c8f3a5c285af6e53a0035d05262ea5fbe31 (patch) | |
| tree | 64ea9b0e817c69d36e0263d377d1d828ed553be9 /sql/sql_rename.cc | |
| parent | 5176be8db85e2fbc3e33a35bb6f02905fdf3ede9 (diff) | |
| parent | b6004e6295717c3b616b58416544557bd858afca (diff) | |
| download | mariadb-git-cf245c8f3a5c285af6e53a0035d05262ea5fbe31.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index cd2c3c348d4..c37227e7d28 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -35,7 +35,7 @@ static TABLE_LIST *reverse_table_list(TABLE_LIST *table_list); bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent) { bool error= 1; - TABLE_LIST *ren_table= 0, *new_table; + TABLE_LIST *ren_table= 0; int to_table; char *rename_log_table[2]= {NULL, NULL}; int disable_logs= 0; @@ -353,7 +353,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db, char *new_table_name, static TABLE_LIST * rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error) { - TABLE_LIST *ren_table,*new_table, *tmp_table; + TABLE_LIST *ren_table, *new_table; DBUG_ENTER("rename_tables"); |