diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
| commit | d95ec59726ad44cc26bee2e32c9bffa0052b0a51 (patch) | |
| tree | 66e0033b6a729fa25769f98640f7ec7b1bfc719f /sql/sql_table.cc | |
| parent | 241e25389f99fa5a536ac3a0bb50d269ec637f07 (diff) | |
| parent | 7648e3bc3c3dd27f97b878760938f748499fd378 (diff) | |
| download | mariadb-git-d95ec59726ad44cc26bee2e32c9bffa0052b0a51.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 2c59f4b3482..a300808e6c3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1437,7 +1437,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, } /* Remove link to old table and rename the new one */ close_temporary_table(thd,table->table_cache_key,table_name); - if (rename_temporary_table(new_table, new_db, new_name)) + if (rename_temporary_table(thd, new_table, new_db, new_name)) { // Fatal error close_temporary_table(thd,new_db,tmp_name); my_free((gptr) new_table,MYF(0)); @@ -1615,6 +1615,8 @@ copy_data_between_tables(TABLE *from,TABLE *to, (copy_end++)->set(*ptr,def->field,0); } + found_count=delete_count=0; + if(order) { from->io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE), MYF(MY_FAE | MY_ZEROFILL)); @@ -1632,7 +1634,6 @@ copy_data_between_tables(TABLE *from,TABLE *to, init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1); - found_count=delete_count=0; next_field=to->next_number_field; while (!(error=info.read_record(&info))) { |