summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-03-08 17:19:54 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-03-08 17:19:54 +0200
commit2a91c8de82508244460cd5bf4cf29ee4fae7622f (patch)
treea5ef23265ef65a2b773d2e588ba3388d273fdf7d /mysys
parentbbcce1cbc580765b1432787bdc9ef6b0d5b64cf2 (diff)
parentf9ae66383396f834c81c96e5972e2eeaf8c8365f (diff)
downloadmariadb-git-2a91c8de82508244460cd5bf4cf29ee4fae7622f.tar.gz
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'mysys')
-rw-r--r--mysys/stacktrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index 175ee8a3025..a3ccc3185ac 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -166,7 +166,7 @@ void my_print_stacktrace(uchar* stack_bottom __attribute__((unused)),
my_safe_printf_stderr("%s",
"Error when traversing the stack, stack appears corrupt.\n");
else
- my_safe_printf_stderr("%s"
+ my_safe_printf_stderr("%s",
"Please read "
"http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
"and follow instructions on how to resolve the stack trace.\n"