diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:56:47 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:56:47 +0200 |
| commit | 54cad2aae3142e8a123f0d62fc0c2bd67a1dc64a (patch) | |
| tree | 724216a239658538138c004f85d8021b15a11a88 | |
| parent | ae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (diff) | |
| download | mariadb-git-54cad2aae3142e8a123f0d62fc0c2bd67a1dc64a.tar.gz | |
Fixed compiler warnings
| -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 9ca0080e976..63495021841 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -741,7 +741,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; |