diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-28 11:25:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-28 11:25:45 +0300 |
| commit | bf8fe324d25e27eef6a587e385d45a8ce51fee65 (patch) | |
| tree | 7b0d981dec21dcbb560543260bf751a59ed32427 /mysys | |
| parent | 626f2a1c170e615c7866c1041746159dc3f709af (diff) | |
| parent | 0955462d0aafab01def9c1a5ec131eb641cb9e68 (diff) | |
| download | mariadb-git-bf8fe324d25e27eef6a587e385d45a8ce51fee65.tar.gz | |
Merge 5.5 into 10.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 701adbf4d14..3b614cb4c15 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -217,7 +217,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) DBUG_SET("-d,simulate_out_of_memory"); DBUG_RETURN((void*) 0); /* purecov: inspected */ }); - length= ALIGN_SIZE(length); + length= ALIGN_SIZE(length) + REDZONE_SIZE; if ((*(prev= &mem_root->free)) != NULL) { if ((*prev)->left < length && @@ -265,6 +265,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) mem_root->used= next; mem_root->first_block_usage= 0; } + point+= REDZONE_SIZE; TRASH_ALLOC(point, original_length); DBUG_PRINT("exit",("ptr: %p", point)); DBUG_RETURN((void*) point); |