diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /mysys/safemalloc.c | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysys/safemalloc.c')
| -rw-r--r-- | mysys/safemalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 5d19647c989..2a484dd1c56 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -375,7 +375,7 @@ void sf_report_leaked_memory(my_thread_id id) { my_thread_id tid = irem->thread_id && irem->flags & MY_THREAD_SPECIFIC ? irem->thread_id : 0; - fprintf(stderr, "Warning: %4lu bytes lost at %p, allocated by T@%lu at ", + fprintf(stderr, "Warning: %4lu bytes lost at %p, allocated by T@%llu at ", (ulong) irem->datasize, (char*) (irem + 1), tid); print_stack(irem->frame); total+= irem->datasize; |