diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
| commit | a13fac9eeef0f304b6b6f52ad2b6659f22190523 (patch) | |
| tree | 7bbcbe8765354f03142a005198276cadbfac6b20 /sql/sql_select.cc | |
| parent | e28d9c15c3093612d841b24b5bb6b480c9b8009c (diff) | |
| parent | f146969fb3a1e8ed508f55ee38faaffd5cff2021 (diff) | |
| download | mariadb-git-a13fac9eeef0f304b6b6f52ad2b6659f22190523.tar.gz | |
Merge 10.5 into 10.6
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 73d7a7d25de..bf3d4fd9bb1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -24232,8 +24232,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; @@ -24245,7 +24244,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; } |