diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 20:26:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-24 11:46:08 +0200 |
| commit | 5ae8fce50bb5cbd7916acd6b03bd699f79c10616 (patch) | |
| tree | 6291ec25e408ea225531e8b79a4f4fd7f3a81329 /mysys | |
| parent | 76098f45b8b1f2224eb25cf5d94450c6f4a1414c (diff) | |
| parent | 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (diff) | |
| download | mariadb-git-5ae8fce50bb5cbd7916acd6b03bd699f79c10616.tar.gz | |
Merge branch '10.1' into 10.2
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 1b0ef857afa..276ad080520 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -204,6 +204,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) uchar* point; reg1 USED_MEM *next= 0; reg2 USED_MEM **prev; + size_t original_length = length; DBUG_ENTER("alloc_root"); DBUG_PRINT("enter",("root: %p", mem_root)); DBUG_ASSERT(alloc_root_inited(mem_root)); @@ -264,7 +265,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) mem_root->used= next; mem_root->first_block_usage= 0; } - TRASH_ALLOC(point, length); + TRASH_ALLOC(point, original_length); DBUG_PRINT("exit",("ptr: %p", point)); DBUG_RETURN((void*) point); #endif |