diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-06-24 21:43:31 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-06-24 21:43:31 +0400 |
| commit | 7880039fc0a2c406fe924e3dcbc09f0691e49007 (patch) | |
| tree | 618d80f7f5a95cf7d1ee9b16bf9bfc1e6d8fbf74 /sql/sql_parse.cc | |
| parent | d6b0767c8c819655e0a90b8f9c33356f92832c87 (diff) | |
| parent | 3d4e3472886a7d3fd939c0cc0b49637fc8c48498 (diff) | |
| download | mariadb-git-7880039fc0a2c406fe924e3dcbc09f0691e49007.tar.gz | |
Merge 5.2 -> 5.3
(testcase for #798597 now crashes)
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index f219c8d6876..315673c450b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); } |