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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2006-02-28 12:40:19 +01:00
parent de7ac12988 46fc76534a
commit 029f16a1af
10 changed files with 297 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@@ -5200,6 +5200,8 @@ copy_data_between_tables(TABLE *from,TABLE *to,
*/
to->file->ha_set_all_bits_in_write_set();
from->file->ha_retrieve_all_cols();
if (from->part_info)
bitmap_set_all(&(from->part_info->used_partitions));
init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1);
if (ignore ||
handle_duplicates == DUP_REPLACE)