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

Merge 5.2 -> 5.3

Browse Source 
(testcase for #798597 now crashes)
This commit is contained in:
Sergey Petrunya
2011-06-24 21:43:31 +04:00
parent d6b0767c8c 3d4e347288
commit 7880039fc0
32 changed files with 834 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@@ -1482,7 +1482,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
{
char *end= buff + length;
length+= my_snprintf(end, buff_len - length - 1,
end," Memory in use: %ldK Max memory used: %ldK",
" Memory in use: %ldK Max memory used: %ldK",
(sf_malloc_cur_memory+1023L)/1024L,
(sf_malloc_max_memory+1023L)/1024L);
}