diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2019-09-18 01:59:29 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2019-09-18 15:06:02 +0530 |
| commit | 273d8eb12c40a6dcd05a8148bdfba3f1fd96e764 (patch) | |
| tree | 4d67cbf15ce5cc7fac333cac019f70eb4afb3916 /sql/sql_statistics.cc | |
| parent | c471bfb34e970075d8649247ab088b19a097eaf4 (diff) | |
| download | mariadb-git-273d8eb12c40a6dcd05a8148bdfba3f1fd96e764.tar.gz | |
MDEV-20589: Server still crashes in Field::set_warning_truncated_wrong_value
The flag is_stat_field is not set for the min_value and max_value of field items
inside table share. This is a must requirement as we don't want to throw
warnings of truncation when we read values from the statistics table to the column
statistics of table share fields.
Diffstat (limited to 'sql/sql_statistics.cc')
| -rw-r--r-- | sql/sql_statistics.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index 26032d8d535..578d3fac641 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1153,12 +1153,14 @@ public: case COLUMN_STAT_MIN_VALUE: table_field->read_stats->min_value->set_notnull(); stat_field->val_str(&val); + DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); 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); + DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); table_field->read_stats->max_value->store(val.ptr(), val.length(), &my_charset_bin); break; @@ -2045,7 +2047,7 @@ void create_min_max_statistical_fields_for_table_share(THD *thd, Field *fld; Field *table_field= *field_ptr; my_ptrdiff_t diff= record - table_share->default_values; - if (!(fld= table_field->clone(&stats_cb->mem_root, diff))) + if (!(fld= table_field->clone(&stats_cb->mem_root, NULL, diff, TRUE))) continue; if (i == 0) table_field->read_stats->min_value= fld; |