diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
| commit | 589cf8dbf3accf57673d7e2f7a4435f7eaf33565 (patch) | |
| tree | aa38a67d10f71fc781188341857e34d437fa9199 /sql/sql_statistics.cc | |
| parent | a3531775b1efe06e2439a0c8ab668a2b69c859eb (diff) | |
| parent | e30a05f4540b581df2e7d98bd7e812aeff603744 (diff) | |
| download | mariadb-git-589cf8dbf3accf57673d7e2f7a4435f7eaf33565.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_statistics.cc')
| -rw-r--r-- | sql/sql_statistics.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index ed569d6eab8..717deeabe18 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -2893,7 +2893,6 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) Field **field_ptr; KEY *key_info, *key_info_end; TABLE_SHARE *table_share= table->s; - enum_check_fields old_check_level= thd->count_cuted_fields; DBUG_ENTER("read_statistics_for_table"); DEBUG_SYNC(thd, "statistics_mem_alloc_start1"); @@ -2909,7 +2908,7 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) } /* Don't write warnings for internal field conversions */ - thd->count_cuted_fields= CHECK_FIELD_IGNORE; + Check_level_instant_set check_level_save(thd, CHECK_FIELD_IGNORE); /* Read statistics from the statistical table table_stats */ Table_statistics *read_stats= table_share->stats_cb.table_stats; @@ -2991,7 +2990,6 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) } } - thd->count_cuted_fields= old_check_level; table_share->stats_cb.end_stats_load(); DBUG_RETURN(0); } |