diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
| commit | 65c5ef9b495bac078ad2a502a75801c7cfe5b95a (patch) | |
| tree | 266859fc4e22dcd18112a25e8a3e4f9d93a043a0 /mysys/my_malloc.c | |
| parent | 7293ce0ee81f05b1ec3ac9ddcc88bfbee4030e55 (diff) | |
| parent | 625994b7cc4ebd0bc2652ae80b93386aa4b766ac (diff) | |
| download | mariadb-git-65c5ef9b495bac078ad2a502a75801c7cfe5b95a.tar.gz | |
dirty merge
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 6a3ec8da093..78b61e8f761 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -117,6 +117,7 @@ void *my_malloc(size_t size, myf my_flags) MY_TEST(my_flags & MY_THREAD_SPECIFIC)); update_malloc_size(size + MALLOC_PREFIX_SIZE, MY_TEST(my_flags & MY_THREAD_SPECIFIC)); + TRASH_ALLOC(point, size); DBUG_EXECUTE_IF("simulate_out_of_memory", { /* my_free() handles memory accounting */ |