diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:58:00 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:58:00 +0200 |
| commit | 522b289607ce10ff3e44fdf8035ae1c29bffe4f4 (patch) | |
| tree | dc6cb18da2d5c07f81627352c19281caa0fa9157 | |
| parent | 038b739c98009cf0b4b7b7c2c18421051abf79f2 (diff) | |
| parent | 54cad2aae3142e8a123f0d62fc0c2bd67a1dc64a (diff) | |
| download | mariadb-git-522b289607ce10ff3e44fdf8035ae1c29bffe4f4.tar.gz | |
Merge with 5.1
| -rw-r--r-- | mysys/stacktrace.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index dce01a0c3b9..847cc746a76 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -173,7 +173,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" diff --git a/sql/mysqld.cc b/sql/mysqld.cc index aa3eb1e584e..586c614555d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -761,7 +761,6 @@ char *opt_logname, *opt_slow_logname; static volatile sig_atomic_t kill_in_progress; #ifdef HAVE_STACKTRACE -static my_bool opt_do_pstack; my_bool opt_stack_trace; #endif /* HAVE_STACKTRACE */ my_bool opt_expect_abort= 0; |