diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-02 14:10:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-03 20:34:30 +0200 |
| commit | c7c481f4d918aaf42cef083b77ab551d69cdae58 (patch) | |
| tree | 8be0987072826c7a8f792cbba2be3dbc2cecb820 /sql/sql_update.cc | |
| parent | 3789692d17625780b546bf2ec4a33acf5badae2c (diff) | |
| download | mariadb-git-c7c481f4d918aaf42cef083b77ab551d69cdae58.tar.gz | |
MDEV-20403 Assertion `0' or Assertion `btr_validate_index(index, 0)' failed in row_upd_sec_index_entry or error code 126: Index is corrupted upon UPDATE with TIMESTAMP..ON UPDATE
Three issues here:
* ON UPDATE DEFAULT NOW columns were updated after generated columns
were computed - this broke indexed virtual columns
* ON UPDATE DEFAULT NOW columns were updated after BEFORE triggers,
so triggers didn't see the correct NEW value
* in case of a multi-update generated columns were also updated
after BEFORE triggers
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 19 |
1 files changed, 8 insertions, 11 deletions
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) { |