diff options
author | Igor Babaev <igor@askmonty.org> | 2018-07-15 16:24:24 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2018-07-15 16:24:24 -0700 |
commit | 095dc81158902380b8618338efabb5ce480dbd79 (patch) | |
tree | 9c9e5196aa79a166934490a051534aee6718a9f6 /sql/sql_statistics.cc | |
parent | 1d10c9afe0f2f4fba73892e6c12ea6efe90d5931 (diff) | |
download | mariadb-git-095dc81158902380b8618338efabb5ce480dbd79.tar.gz |
MDEV-16757 Memory leak after adding manually min/max statistical data
for blob column
ANALYZE TABLE <table> does not collect statistical data on min/max values
for BLOB columns of <table>. However these values can be added into
mysql.column_stats manually by executing proper statements.
Unfortunately this led to a memory leak because the memory allocated
for these values was never freed.
This patch provides the server with a function to free memory allocated
for min/max statistical values of BLOB types.
Temporarily changed the test case until MDEV-16711 is fixed as without
this fix the test case for MDEV-16757 did not fail only for 10.0.
Diffstat (limited to 'sql/sql_statistics.cc')
-rw-r--r-- | sql/sql_statistics.cc | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index abf3975dd9c..a1c21421c59 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -3056,6 +3056,39 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) /** + @breif + Cleanup of min/max statistical values for table share +*/ + +void delete_stat_values_for_table_share(TABLE_SHARE *table_share) +{ + TABLE_STATISTICS_CB *stats_cb= &table_share->stats_cb; + Table_statistics *table_stats= stats_cb->table_stats; + if (!table_stats) + return; + Column_statistics *column_stats= table_stats->column_stats; + if (!column_stats) + return; + + for (Field **field_ptr= table_share->field; + *field_ptr; + field_ptr++, column_stats++) + { + if (column_stats->min_value) + { + delete column_stats->min_value; + column_stats->min_value= NULL; + } + if (column_stats->max_value) + { + delete column_stats->max_value; + column_stats->max_value= NULL; + } + } +} + + +/** @brief Check whether any statistics is to be read for tables from a table list |