diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:04:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:04:16 +0200 |
| commit | 199863d72b7cccaa4c75641c50c45a83b568ab8c (patch) | |
| tree | 4a5e71963b2fd64141439552c1493d4ab368c3b9 /storage | |
| parent | 99362359850d3cece6e465788827aef7e8c33ca6 (diff) | |
| download | mariadb-git-199863d72b7cccaa4c75641c50c45a83b568ab8c.tar.gz | |
MDEV-23991 fixup: Initialize the memory
Also, revert the work-around for the test that was attempted in
commit 85613a32477ef4b8fb9aefba5f61689028f3ff87.
This issue was caught by MemorySanitizer as well as on the
Microsoft Windows debug builds, thanks to /MD being used
starting with 10.4.
The code fix will also be applied to 10.2 because the regression
was introduced in commit afc9d00c66db946c8240fe1fa6b345a3a8b6fec1.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0stats.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 950e33c090b..ba724703221 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -2244,6 +2244,9 @@ dict_stats_update_persistent( } ut_ad(!dict_index_is_ibuf(index)); + mutex_enter(&dict_sys.mutex); + dict_stats_empty_index(index, false); + mutex_exit(&dict_sys.mutex); index_stats_t stats = dict_stats_analyze_index(index); |