mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT Docs/manual.texi: Updated Changelog Cleaned up adding character sets merge/open.c: skip comments myisam/mi_check.c: Fixed bug when sorting index on Windows myisammrg/myrg_info.c: Use only portable printf arguments myisammrg/myrg_rrnd.c: Use only portable printf arguments mysql-test/r/distinct.result: Added test case for bug in distinct mysql-test/r/merge.result: Added test for ALTER TABLE mysql-test/t/distinct.test: Added test case for bug in distinct mysql-test/t/merge.test: Added test for ALTER TABLE sql-bench/crash-me.sh: Fixed portability issues sql/ha_myisammrg.cc: Fixed for ALTER TABLE on MERGE tables sql/item_sum.cc: Fixed bug in DISTINCT sql/sql_db.cc: Added test of namelen in check_db_name sql/sql_select.cc: Fixed bug in DISTINCT sql/sql_select.h: Fixed bug in DISTINCT sql/sql_table.cc: Fixed ALTER TABLE on MERGE tables sql/table.cc: Added test of namelen in check_db_name sql/table.h: Fixed ALTER TABLE on MERGE tables
This commit is contained in:
@@ -1443,10 +1443,13 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
|
||||
thd->cuted_fields=0L;
|
||||
thd->proc_info="copy to tmp table";
|
||||
next_insert_id=thd->next_insert_id; // Remember for loggin
|
||||
error=copy_data_between_tables(table,new_table,create_list,handle_duplicates,
|
||||
order, &copied,&deleted);
|
||||
copied=deleted=0;
|
||||
if (!new_table->is_view)
|
||||
error=copy_data_between_tables(table,new_table,create_list,
|
||||
handle_duplicates,
|
||||
order, &copied, &deleted);
|
||||
thd->last_insert_id=next_insert_id; // Needed for correct log
|
||||
thd->count_cuted_fields=0; /* Don`t calc cuted fields */
|
||||
thd->count_cuted_fields=0; // Don`t calc cuted fields
|
||||
new_table->time_stamp=save_time_stamp;
|
||||
|
||||
if (table->tmp_table)
|
||||
|
Reference in New Issue
Block a user