diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 11:32:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 11:32:46 +0300 |
| commit | 90a91936852368774559a3ef2660e63e1e6f50e3 (patch) | |
| tree | 97004f253bea0db37606928b592ae3bc70fa6672 /mysys/my_alloc.c | |
| parent | fcb68ffe3dfb1c841852bd62a9aac9708888f4e9 (diff) | |
| parent | 6eefeb6fea05ff17d010d173ef244a1d92078d71 (diff) | |
| download | mariadb-git-90a91936852368774559a3ef2660e63e1e6f50e3.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysys/my_alloc.c')
| -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 42def886250..b24e9c21623 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -225,7 +225,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 && @@ -274,6 +274,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); |