diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-04 17:52:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-04 17:52:04 +0300 |
| commit | 537f8594a60a1e09d6da0933b55764e0f8abbf5c (patch) | |
| tree | 628c68bccb01538df826045ba6f3aaa45c29b93a /sql/sql_insert.cc | |
| parent | 647d5b243020b799fd7112a801965f5780b86349 (diff) | |
| parent | f605ce08b5c0e6ed6907d0639bcc5b5630e9b40a (diff) | |
| download | mariadb-git-537f8594a60a1e09d6da0933b55764e0f8abbf5c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 9669c002731..2a7fca591c2 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1835,10 +1835,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) be updated as if this is an UPDATE. */ if (different_records && table->default_field) - { - if (table->update_default_fields(1, info->ignore)) - goto err; - } + table->evaluate_update_default_function(); /* CHECK OPTION for VIEW ... ON DUPLICATE KEY UPDATE ... */ res= info->table_list->view_check_option(table->in_use, info->ignore); @@ -3856,7 +3853,7 @@ int select_insert::send_data(List<Item> &values) thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields store_values(values); if (table->default_field && - unlikely(table->update_default_fields(0, info.ignore))) + unlikely(table->update_default_fields(info.ignore))) DBUG_RETURN(1); thd->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL; if (unlikely(thd->is_error())) |