summaryrefslogtreecommitdiff
path: root/mysys/my_malloc.c
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2006-11-20 22:42:06 +0200
committermonty@mysql.com/nosik.monty.fi <>2006-11-20 22:42:06 +0200
commite82587980037d3c27d84411c332d812d47f424bd (patch)
treec8a26659fd67578dcb2edfa68c23c6ca4650fc4e /mysys/my_malloc.c
parent0f455a81dc2060811498cf1e18059d4f2c7ecd87 (diff)
downloadmariadb-git-e82587980037d3c27d84411c332d812d47f424bd.tar.gz
Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
Diffstat (limited to 'mysys/my_malloc.c')
-rw-r--r--mysys/my_malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index f33db2655c4..c6d51e29f18 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -44,7 +44,7 @@ gptr my_malloc(unsigned int size, myf my_flags)
}
else if (my_flags & MY_ZEROFILL)
bzero(point,size);
- DBUG_PRINT("exit",("ptr: 0x%lx",point));
+ DBUG_PRINT("exit",("ptr: 0x%lx", (long) point));
DBUG_RETURN(point);
} /* my_malloc */
@@ -55,7 +55,7 @@ gptr my_malloc(unsigned int size, myf my_flags)
void my_no_flags_free(gptr ptr)
{
DBUG_ENTER("my_free");
- DBUG_PRINT("my",("ptr: 0x%lx",ptr));
+ DBUG_PRINT("my",("ptr: 0x%lx", (long) ptr));
if (ptr)
free(ptr);
DBUG_VOID_RETURN;