diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-21 16:18:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-21 22:58:52 +0200 |
| commit | 3d7915f000b15ad296e3ff18d750f36a4f17de0e (patch) | |
| tree | a5abe2dd6e6b8a633130597aa08937fcc92c965b /storage/innobase/mem | |
| parent | 82aeb6b59640b9733c4026bda71887720153b70a (diff) | |
| parent | 4629db0dd6442ea7c2d3ecd636060bc4d21f2d19 (diff) | |
| download | mariadb-git-3d7915f000b15ad296e3ff18d750f36a4f17de0e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/mem')
| -rw-r--r-- | storage/innobase/mem/mem0mem.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/mem/mem0mem.cc b/storage/innobase/mem/mem0mem.cc index ca83891d459..c101980d543 100644 --- a/storage/innobase/mem/mem0mem.cc +++ b/storage/innobase/mem/mem0mem.cc @@ -348,6 +348,11 @@ mem_heap_create_block_func( 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); |