summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-07-03 18:37:33 +0300
committerMonty <monty@mariadb.org>2020-07-03 18:37:33 +0300
commit484931325e7bcecddc6daf1a55c008ddd67497e4 (patch)
treeec37e6b0404a5081aee7f00fe3ee70ea3d3f48ea /storage
parent6e81ba0c12d1b94c0c046e1062f06e426036dbb2 (diff)
downloadmariadb-git-484931325e7bcecddc6daf1a55c008ddd67497e4.tar.gz
Fix for MSAN from Marko related to buf_pool_resize
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/buf/buf0buf.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index e2425ccb6cc..c9cff9b3295 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -1622,6 +1622,8 @@ buf_chunk_init(
return(NULL);
}
+ MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size());
+
#ifdef HAVE_LIBNUMA
if (srv_numa_interleave) {
struct bitmask *numa_mems_allowed = numa_get_mems_allowed();
@@ -2908,6 +2910,9 @@ withdraw_retry:
while (chunk < echunk) {
buf_block_t* block = chunk->blocks;
+ MEM_MAKE_ADDRESSABLE(chunk->mem,
+ chunk->mem_size());
+
for (ulint j = chunk->size;
j--; block++) {
mutex_free(&block->mutex);