diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
| commit | ad368a2b54f4177daf5abd17fa7533f1626f6feb (patch) | |
| tree | c762060dc3c06f7b35460ef22fecc08cf8adee55 /mysys/safemalloc.c | |
| parent | 716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff) | |
| parent | a6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff) | |
| download | mariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz | |
Merge Mysql 5.1.39 merge into MariaDB trunk
Diffstat (limited to 'mysys/safemalloc.c')
| -rw-r--r-- | mysys/safemalloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index c666b517608..d6cd3896b08 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -272,6 +272,9 @@ void _myfree(void *ptr, const char *filename, uint lineno, myf myflags) irem= (struct st_irem *) ((char*) ptr- ALIGN_SIZE(sizeof(struct st_irem))- sf_malloc_prehunc); + if (sf_malloc_quick) + (void) _checkchunk(irem, filename, lineno); + /* Check to make sure that we have a real remember structure. Note: this test could fail for four reasons: |