diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-20 18:36:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-20 18:36:03 +0200 |
| commit | 04921000594dcbdf23340850b9284fd30ccdb0fd (patch) | |
| tree | 94a14b06efc781d8ddd12b5a9276c533c12a5868 /storage/innobase/mem/mem0mem.cc | |
| parent | e3dd9a95e50ef2019435b01bd9e161d552673a28 (diff) | |
| parent | 69bc3c1976ebcbe116890d9d26305fd2887ed47c (diff) | |
| download | mariadb-git-04921000594dcbdf23340850b9284fd30ccdb0fd.tar.gz | |
Merge 5.5 into 10.0
Diffstat (limited to 'storage/innobase/mem/mem0mem.cc')
| -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 b9f190509ee..f91126697fc 100644 --- a/storage/innobase/mem/mem0mem.cc +++ b/storage/innobase/mem/mem0mem.cc @@ -406,6 +406,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); |