diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
| commit | da4503e956ee067947e504c6e73052d9d906742c (patch) | |
| tree | a70bbc33f0411ef29c347a570d8253445d8013e4 /sql/sql_load.cc | |
| parent | babbf8c6fc6da92cd1b2bb23f04e996f84b0ca1a (diff) | |
| parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
| download | mariadb-git-da4503e956ee067947e504c6e73052d9d906742c.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index fe72d40b802..530f4379530 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -368,22 +368,22 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, Let us also prepare SET clause, altough it is probably empty in this case. */ - if (setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) || - setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0)) + if (setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) || + setup_fields(thd, 0, 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, 0, fields_vars, MARK_COLUMNS_WRITE, 0, 0) || - setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) || + if (setup_fields(thd, 0, fields_vars, MARK_COLUMNS_WRITE, 0, NULL, 0) || + setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) || check_that_all_fields_are_given_values(thd, table, table_list)) DBUG_RETURN(TRUE); /* Add all fields with default functions to table->write_set. */ if (table->default_field) table->mark_default_fields_for_write(); /* Fix the expressions in SET clause */ - if (setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0)) + if (setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, NULL, 0)) DBUG_RETURN(TRUE); } |