database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-27 20:41:31 +03:00
parent acf6f92aa9 00377147e3
commit 4d59f45260
39 changed files with 547 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_load.cc
View File

@ -663,6 +663,10 @@ int mysql_load(THD *thd, const sql_exchange *ex, TABLE_LIST *table_list,
thd->abort_on_warning= !ignore && thd->is_strict_mode();
if ((table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS) &&
(error= table_list->table->file->ha_rnd_init_with_error(0)))
goto err;
thd_progress_init(thd, 2);
if (table_list->table->validate_default_values_of_unset_fields(thd))
{
@ -682,6 +686,9 @@ int mysql_load(THD *thd, const sql_exchange *ex, TABLE_LIST *table_list,
set_fields, set_values, read_info,
*ex->enclosed, skip_lines, ignore);
if (table_list->table->file->ha_table_flags() & HA_DUPLICATE_POS)
table_list->table->file->ha_rnd_end();
thd_proc_info(thd, "End bulk insert");
if (likely(!error))
thd_progress_next_stage(thd);