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 patch for ha_rnd_init()

Browse Source
This commit is contained in:
Michael Widenius
2010-07-17 01:51:46 +03:00
parent 4090100743 e9166ca152
commit 178f18467e
27 changed files with 196 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -7877,7 +7877,8 @@ copy_data_between_tables(TABLE *from,TABLE *to,
/* Tell handler that we have values for all columns in the to table */
to->use_all_columns();
to->mark_virtual_columns_for_write(TRUE);
init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1, 1, FALSE);
if (init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1, 1, FALSE))
goto err;
errpos= 4;
if (ignore)
to->file->extra(HA_EXTRA_IGNORE_DUP_KEY);