diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
| commit | 84c6c75979e990601c1cc88481fe339e12709d54 (patch) | |
| tree | 6183377281b4be8088dffc147181b93469c25289 /mysys/stacktrace.c | |
| parent | 4c74d96f51fe67d4ad29e4e430a905559859e35e (diff) | |
| parent | c657f00458a3c3fb8a35e974c453ed62b903ec9b (diff) | |
| download | mariadb-git-84c6c75979e990601c1cc88481fe339e12709d54.tar.gz | |
Merge 5.1 => 5.5
storage/innobase/include/sync0rw.ic:
Prerequisite for compiling with gcc4 on solaris: ignore result from
os_compare_and_swap_ulint
storage/myisam/mi_dynrec.c:
Prerequisite for compiling with gcc4 on solaris: cast to void*
Diffstat (limited to 'mysys/stacktrace.c')
| -rw-r--r-- | mysys/stacktrace.c | 2 |
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" |