diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:29:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:29:05 +0300 |
| commit | 28fad39de718c6c070f357f6d5a72ee6ac4bd804 (patch) | |
| tree | 87f02f09a6473072d1451016c0421dbab7837b4c /mysys | |
| parent | da65298f3614f17eeb55608aba7f9044a24d9aa8 (diff) | |
| parent | f98bb23168ee9bc0da8aa7111f35cf2539986387 (diff) | |
| download | mariadb-git-28fad39de718c6c070f357f6d5a72ee6ac4bd804.tar.gz | |
Merge 10.4 into 10.5
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 47a6d8da2cb..79e4ba9d563 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); |