diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
| commit | 6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8 (patch) | |
| tree | 3915bd814fa0ea7c0219b258a1fb458846a5b0bd /sql/sql_select.cc | |
| parent | e76e12886fd37094d95ca40b8cce45ca3ef28021 (diff) | |
| parent | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff) | |
| download | mariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a2cc265ec5b..808d49d4067 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -24256,8 +24256,7 @@ cmp_buffer_with_ref(THD *thd, TABLE *table, TABLE_REF *tab_ref) bool cp_buffer_from_ref(THD *thd, TABLE *table, TABLE_REF *ref) { - enum enum_check_fields save_count_cuted_fields= thd->count_cuted_fields; - thd->count_cuted_fields= CHECK_FIELD_IGNORE; + Check_level_instant_set check_level_save(thd, CHECK_FIELD_IGNORE); my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set); bool result= 0; @@ -24269,7 +24268,6 @@ cp_buffer_from_ref(THD *thd, TABLE *table, TABLE_REF *ref) break; } } - thd->count_cuted_fields= save_count_cuted_fields; dbug_tmp_restore_column_map(table->write_set, old_map); return result; } |