database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mdev539->10.0-base.

Browse Source
This commit is contained in:
Igor Babaev
2012-12-20 15:38:29 -08:00
parent f6636852c4 ca2cdaad86
commit 88b59efef6
23 changed files with 688 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -7469,7 +7469,8 @@ copy_data_between_tables(THD *thd, TABLE *from,TABLE *to,
MODE_STRICT_ALL_TABLES));
from->file->info(HA_STATUS_VARIABLE);
to->file->ha_start_bulk_insert(from->file->stats.records);
to->file->ha_start_bulk_insert(from->file->stats.records,
ignore ? 0 : HA_CREATE_UNIQUE_INDEX_BY_SORT);
errpos= 3;
copy_end=copy;