diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
| commit | d3350c160a7a884e97a5e4a696432230c13d53e0 (patch) | |
| tree | f7f5c35737b4c87dcfac73f7547d0d2321276be9 /sql/sql_statistics.cc | |
| parent | a39c4b5f9f7f4d2766f1ddb9487de27259e804a1 (diff) | |
| parent | b6bb64e54a3e34a20cda34e25b6ec62a097955ef (diff) | |
| download | mariadb-git-d3350c160a7a884e97a5e4a696432230c13d53e0.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_statistics.cc')
| -rw-r--r-- | sql/sql_statistics.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index 1222d0e0d5f..aa95002bed3 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1136,18 +1136,12 @@ public: case COLUMN_STAT_MIN_VALUE: table_field->read_stats->min_value->set_notnull(); stat_field->val_str(&val); -#if 0 /* MDEV-20589 FIXME: This fails! */ - DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); -#endif table_field->read_stats->min_value->store(val.ptr(), val.length(), &my_charset_bin); break; case COLUMN_STAT_MAX_VALUE: table_field->read_stats->max_value->set_notnull(); stat_field->val_str(&val); -#if 0 /* MDEV-20589 FIXME: This fails! */ - DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); -#endif table_field->read_stats->max_value->store(val.ptr(), val.length(), &my_charset_bin); break; @@ -3057,6 +3051,7 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) TABLE_SHARE *table_share= table->s; Table_statistics *read_stats= table_share->stats_cb.table_stats; enum_check_fields old_check_level= thd->count_cuted_fields; + DBUG_ENTER("read_statistics_for_table"); /* Don't write warnings for internal field conversions */ |