diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:38:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:38:12 +0200 |
| commit | ba4f8e317de33330c882b5de14979685a0216ce0 (patch) | |
| tree | a2e443c0ae4e4ea12daef526a05b7fe9128cedda | |
| parent | 25ac047bafefa582ff082d1ad1783e5ff3865c20 (diff) | |
| download | mariadb-git-ba4f8e317de33330c882b5de14979685a0216ce0.tar.gz | |
MDEV-26826 fixup for Valgrind and MemorySanitizer
The debug assertion that was added in
commit 9b967c4c31555174a293922d4717d83b7d68bc76
tripped Valgrind and MemorySanitizer.
buf_block_init(): Assert that block->page.hash was zero-initialized.
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 9fe66c6e68b..cbc19d3b14a 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -993,6 +993,8 @@ buf_block_init(buf_block_t* block, byte* frame) page_zip_des_init(&block->page.zip); + MEM_MAKE_DEFINED(&block->page.hash, sizeof block->page.hash); + ut_ad(!block->page.hash); MEM_MAKE_DEFINED(&block->lock, sizeof block->lock); block->lock.init(); } |