diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
| commit | 184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (patch) | |
| tree | fabb5447e17b9f0959cb83b6d88351367ca53645 /sql/sql_table.cc | |
| parent | 298ba0d39d6d38d5be860a3ad8a55b469b67e7d8 (diff) | |
| download | mariadb-git-184e24b2253a81b03476e3d4d8cf56d5eb9dbf18.tar.gz | |
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
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 954a1f8efd7..9e720558456 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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) |