diff options
| author | unknown <monty@mysql.com> | 2004-08-23 13:47:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-08-23 13:47:52 +0300 |
| commit | f0c1dadbdbe51241f169f6378cd98c7964dc2a1f (patch) | |
| tree | 32095a2c9e113e57ea404fff75abd4f8a5452af3 /mysys/my_realloc.c | |
| parent | 40f282d593b83453344136144b7071d9b6e4c025 (diff) | |
| parent | f7d0dfd9e8966a6c4c885ade872273dddd36e228 (diff) | |
| download | mariadb-git-f0c1dadbdbe51241f169f6378cd98c7964dc2a1f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
mysys/mf_keycache.c:
Auto merged
mysys/my_lib.c:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysys/my_realloc.c')
| -rw-r--r-- | mysys/my_realloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_realloc.c b/mysys/my_realloc.c index 5190fa75dce..c8edb172890 100644 --- a/mysys/my_realloc.c +++ b/mysys/my_realloc.c @@ -27,7 +27,7 @@ gptr my_realloc(gptr oldpoint, uint size, myf my_flags) { gptr point; DBUG_ENTER("my_realloc"); - DBUG_PRINT("my",("ptr: %lx size: %u my_flags: %d",oldpoint, size, + DBUG_PRINT("my",("ptr: 0x%lx size: %u my_flags: %d",oldpoint, size, my_flags)); if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR)) @@ -60,6 +60,6 @@ gptr my_realloc(gptr oldpoint, uint size, myf my_flags) my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), size); } #endif - DBUG_PRINT("exit",("ptr: %lx",point)); + DBUG_PRINT("exit",("ptr: 0x%lx",point)); DBUG_RETURN(point); } /* my_realloc */ |