diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
| commit | 835cbbcc7b797188a89671019f2b2844e1a14e0c (patch) | |
| tree | 010dd112f16b88bb655c32abb6b93987fe5c6c99 /sql/sql_load.cc | |
| parent | fe8cf8fdf1c4c0a9ec60690a8d2738fd255c8dd5 (diff) | |
| parent | 003cb2f42477772ae43228c0bc0f8492246b9340 (diff) | |
| download | mariadb-git-835cbbcc7b797188a89671019f2b2844e1a14e0c.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
TODO: enable MDEV-13049 optimization for 10.3
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 6cd0b76c66d..cf676d5f706 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -387,21 +387,23 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, in this case. */ if (setup_fields(thd, Ref_ptr_array(), - set_fields, MARK_COLUMNS_WRITE, 0, 0) || - setup_fields(thd, Ref_ptr_array(), set_values, MARK_COLUMNS_READ, 0, 0)) + set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) || + setup_fields(thd, Ref_ptr_array(), + set_values, MARK_COLUMNS_READ, 0, NULL, 0)) DBUG_RETURN(TRUE); } else { // Part field list /* TODO: use this conds for 'WITH CHECK OPTIONS' */ if (setup_fields(thd, Ref_ptr_array(), - fields_vars, MARK_COLUMNS_WRITE, 0, 0) || + fields_vars, MARK_COLUMNS_WRITE, 0, NULL, 0) || setup_fields(thd, Ref_ptr_array(), - set_fields, MARK_COLUMNS_WRITE, 0, 0) || + set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) || check_that_all_fields_are_given_values(thd, table, table_list)) DBUG_RETURN(TRUE); /* Fix the expressions in SET clause */ - if (setup_fields(thd, Ref_ptr_array(), set_values, MARK_COLUMNS_READ, 0, 0)) + if (setup_fields(thd, Ref_ptr_array(), + set_values, MARK_COLUMNS_READ, 0, NULL, 0)) DBUG_RETURN(TRUE); } switch_to_nullable_trigger_fields(fields_vars, table); |