summaryrefslogtreecommitdiff
path: root/storage/xtradb/mem
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2018-03-20 10:46:57 +0300
committerEugene Kosov <claprix@yandex.ru>2018-03-20 10:46:57 +0300
commit5a8f8f89d65b75e51048288a49c86a8d974a8543 (patch)
tree1f879a7c5d62094cb8bf91c020bba061cb03505b /storage/xtradb/mem
parent75c76dbb06a99359d867e2a516f3244bf41fde96 (diff)
downloadmariadb-git-5a8f8f89d65b75e51048288a49c86a8d974a8543.tar.gz
honor alignment rules and xtradb too
Diffstat (limited to 'storage/xtradb/mem')
-rw-r--r--storage/xtradb/mem/mem0mem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/xtradb/mem/mem0mem.c b/storage/xtradb/mem/mem0mem.c
index 6e9a39d329f..924231470aa 100644
--- a/storage/xtradb/mem/mem0mem.c
+++ b/storage/xtradb/mem/mem0mem.c
@@ -404,6 +404,11 @@ mem_heap_create_block(
heap->total_size += len;
}
+ /* Poison all available memory. Individual chunks will be unpoisoned on
+ every mem_heap_alloc() call. */
+ compile_time_assert(MEM_BLOCK_HEADER_SIZE >= sizeof *block);
+ UNIV_MEM_FREE(block + 1, len - sizeof *block);
+
ut_ad((ulint)MEM_BLOCK_HEADER_SIZE < len);
return(block);