diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:39:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:39:31 +0300 |
| commit | 7ae290c75753d269fd6d10aa1b5f0c9bec1b7f2c (patch) | |
| tree | ebb6ae21e4e8f384590746988caf3c6311cc7c4b /sql/sql_statistics.cc | |
| parent | e157f817713f22f26b584155faa38b121deff222 (diff) | |
| parent | ef701bfd075331843f512415541e54ba784d9b98 (diff) | |
| download | mariadb-git-7ae290c75753d269fd6d10aa1b5f0c9bec1b7f2c.tar.gz | |
Merge 10.2 into 10.3
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 59ae111f716..50f7446f38a 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1155,18 +1155,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; @@ -2995,6 +2989,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 */ |