revision-id: 988d6d30a5ac41f00e54a72f0ba08301afab4fe7 (mariadb-10.2.18-66-g988d6d30a5a) parent(s): 031efde365c674dbdbaada95aa6d42a4274db438 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-11-13 11:15:01 +0100 message: postreview --- sql/item.h | 2 +- sql/sql_base.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item.h b/sql/item.h index 5866f328f38..e7bf9285131 100644 --- a/sql/item.h +++ b/sql/item.h @@ -5232,7 +5232,7 @@ class Item_default_value : public Item_field virtual void update_used_tables() { if (field && field->default_value) - field->default_value->expr->walk(&Item::register_field_in_read_map, 1, 0); + field->default_value->expr->update_used_tables(); } Field *get_tmp_table_field() { return 0; } Item *get_tmp_table_item(THD *thd) { return this; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0deb5ec1362..c282db42fdd 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5737,7 +5737,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list, TABLE *table= field_to_set->table; if (thd->mark_used_columns == MARK_COLUMNS_READ) bitmap_set_bit(table->read_set, field_to_set->field_index); - else if (thd->mark_used_columns == MARK_COLUMNS_WRITE) + else bitmap_set_bit(table->write_set, field_to_set->field_index); } }