From c657f00458a3c3fb8a35e974c453ed62b903ec9b Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Tue, 6 Mar 2012 13:30:30 +0100
Subject: [PATCH] Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE
 FUNCTIONS

Post-push fixes.


mysys/stacktrace.c:
  Missing comma after "%s" format specifier.
sql/mysqld.cc:
  Move #define to signal_handler.cc
sql/signal_handler.cc:
  Missing #define UNSAFE_DEFAULT_LINUX_THREADS 200
---
 mysys/stacktrace.c    | 2 +-
 sql/mysqld.cc         | 4 ----
 sql/signal_handler.cc | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index b2eae0fb4c6..8ef98f197b8 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -170,7 +170,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 c47d39721b9..b4dd3108707 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2468,10 +2468,6 @@ static void check_data_home(const char *path)
 
 #endif /*__WIN__ || __NETWARE */
 
-#ifdef HAVE_LINUXTHREADS
-#define UNSAFE_DEFAULT_LINUX_THREADS 200
-#endif
-
 
 #if BACKTRACE_DEMANGLE
 #include <cxxabi.h>
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 54b456ec2c4..121338c31d2 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -131,6 +131,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
     "Hope that's ok; if not, decrease some variables in the equation.\n\n");
 
 #if defined(HAVE_LINUXTHREADS)
+#define UNSAFE_DEFAULT_LINUX_THREADS 200
   if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
   {
     my_safe_printf_stderr(