diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 10 | ||||
| -rw-r--r-- | sql/sql_update.cc | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 14740274b87..f7f7d50bc85 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8071,9 +8071,13 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values, rfield->set_explicit_default(value); } - if (!update && table_arg->default_field && - table_arg->update_default_fields(ignore_errors)) - goto err; + if (update) + table_arg->evaluate_update_default_function(); + else + if (table_arg->default_field && + table_arg->update_default_fields(ignore_errors)) + goto err; + /* Update virtual fields */ if (table_arg->vfield && table_arg->update_virtual_fields(table_arg->file, VCOL_UPDATE_FOR_WRITE)) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 0d55fa58bde..65a828147ae 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -66,12 +66,15 @@ bool compare_record(const TABLE *table) { DBUG_ASSERT(records_are_comparable(table)); - if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) != 0) + if (table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ || + table->s->has_update_default_function) { /* Storage engine may not have read all columns of the record. Fields (including NULL bits) not in the write_set may not have been read and can therefore not be compared. + Or ON UPDATE DEFAULT NOW() could've changed field values, including + NULL bits. */ for (Field **ptr= table->field ; *ptr != NULL; ptr++) { @@ -762,8 +765,6 @@ int mysql_update(THD *thd, if (!can_compare_record || compare_record(table)) { - if (table->default_field) - table->evaluate_update_default_function(); if ((res= table_list->view_check_option(thd, ignore)) != VIEW_CHECK_OK) { @@ -2154,9 +2155,6 @@ int multi_update::send_data(List<Item> ¬_used_values) { int error; - if (table->default_field) - table->evaluate_update_default_function(); - if ((error= cur_table->view_check_option(thd, ignore)) != VIEW_CHECK_OK) { @@ -2472,6 +2470,10 @@ int multi_update::do_updates() copy_field_ptr->to_field->set_has_explicit_value(); } + table->evaluate_update_default_function(); + if (table->vfield && + table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_WRITE)) + goto err2; if (table->triggers && table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, TRG_ACTION_BEFORE, TRUE)) @@ -2480,11 +2482,6 @@ int multi_update::do_updates() if (!can_compare_record || compare_record(table)) { int error; - if (table->default_field) - table->evaluate_update_default_function(); - if (table->vfield && - table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_WRITE)) - goto err2; if ((error= cur_table->view_check_option(thd, ignore)) != VIEW_CHECK_OK) { |