diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 11ed10cbe2c7c4b83aca4153856e76f4bdc484dd (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /mysys/safemalloc.c | |
| parent | dfcc0010cf7be502bfca31aff75ba830f6962264 (diff) | |
| parent | 670f2f62c48741ea72440a1574dc99bae9390131 (diff) | |
| download | mariadb-git-11ed10cbe2c7c4b83aca4153856e76f4bdc484dd.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'mysys/safemalloc.c')
| -rw-r--r-- | mysys/safemalloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 0e489263c69..deb6c73327e 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -60,7 +60,7 @@ */ #ifndef SAFEMALLOC -#define SAFEMALLOC /* Get protos from my_sys */ +#define SAFEMALLOC 1 /* Get protos from my_sys */ #endif #include "mysys_priv.h" @@ -124,7 +124,8 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags) struct st_irem *irem; uchar *data; DBUG_ENTER("_mymalloc"); - DBUG_PRINT("enter",("Size: %lu", (ulong) size)); + DBUG_PRINT("enter",("Size: %lu Total alloc: %lu", (ulong) size, + (ulong) sf_malloc_cur_memory)); if (!sf_malloc_quick) (void) _sanity (filename, lineno); @@ -320,6 +321,7 @@ void _myfree(void *ptr, const char *filename, uint lineno, myf myflags) sf_malloc_cur_memory-= irem->datasize; sf_malloc_count--; pthread_mutex_unlock(&THR_LOCK_malloc); + DBUG_PRINT("info", ("bytes freed: %ld", (ulong) irem->datasize)); #ifndef HAVE_valgrind /* Mark this data as free'ed */ |