diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-04 14:02:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-04 15:37:23 +0200 |
| commit | 8dca4cf53ff9d738d39730014d79205d6fd014fd (patch) | |
| tree | 9781e3e4fc2e8c859bafe25a791ee2c456779752 /sql/item.cc | |
| parent | 53ec9047c91c66644799ad058e998a7cfe1afef0 (diff) | |
| download | mariadb-git-8dca4cf53ff9d738d39730014d79205d6fd014fd.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
remove a special treatment of a bare DEFAULT keyword that made it
behave inconsistently and differently from DEFAULT(column).
Now all forms of the explicit assignment of a default column value
behave identically, and all count as an explicitly assigned value
(for the purpose of ON UPDATE NOW).
followup for c7c481f4d91
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 58b00e41fb1..333d71ddf70 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9010,8 +9010,6 @@ int Item_default_value::save_in_field(Field *field_arg, bool no_conversions) return Item_field::save_in_field(field_arg, no_conversions); } - if (field_arg->default_value && field_arg->default_value->flags) - return 0; // defaut fields will be set later, no need to do it twice return field_arg->save_in_field_default_value(context->error_processor == &view_error_processor); } @@ -9263,7 +9261,7 @@ bool Item_trigger_field::set_value(THD *thd, sp_rcontext * /*ctx*/, Item **it) int err_code= item->save_in_field(field, 0); field->table->copy_blobs= copy_blobs_saved; - field->set_explicit_default(item); + field->set_has_explicit_value(); return err_code < 0; } |