diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-01-11 19:12:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-11 20:24:40 +0100 |
| commit | 0d1d0d77f2a72d9cb6de0489dceb37644caf9037 (patch) | |
| tree | 98b7c0fa65468555ffab1441c8b10c999aff15db /sql/sql_trigger.cc | |
| parent | ab93a4d4df7206833fa4a8eb0aa47b8ba185da60 (diff) | |
| download | mariadb-git-0d1d0d77f2a72d9cb6de0489dceb37644caf9037.tar.gz | |
MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))' failed in Field_time::store_TIME_with_warning
vcols and triggers. Revert 094f4cf77890c5a747a57cf2bed149b0b6933507,
backport the correct fix (Table_triggers_list::mark_fields_used() not
marking vcols) from 10.2.
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index b6915b708fa..4d7338b2e1d 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -2246,6 +2246,9 @@ void Table_triggers_list::mark_fields_used(trg_event_type event) bitmap_set_bit(trigger_table->read_set, trg_field->field_idx); if (trg_field->get_settable_routine_parameter()) bitmap_set_bit(trigger_table->write_set, trg_field->field_idx); + if (trigger_table->field[trg_field->field_idx]->vcol_info) + trigger_table->mark_virtual_col(trigger_table-> + field[trg_field->field_idx]); } } } |