database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-02-25 18:19:55 +01:00
parent 0485328d03 0251232f8c
commit 00d1db7a38
372 changed files with 10986 additions and 4523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/safemalloc.c
View File

@@ -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;