bzr push into mysql-5.1 branch (tor.didriksen:3700 to 3701) Bug#11761576

[Tor Didriksen]

 3701 Tor Didriksen	2012-03-06
      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

    modified:
      mysys/stacktrace.c
      sql/mysqld.cc
      sql/signal_handler.cc
 3700 Mattias Jonsson	2012-02-29 [merge]
      merge into mysql-5.1

    removed:
      mysql-test/t/cache_innodb-master.opt
    added:
      mysql-test/r/partition_cache.result
      mysql-test/t/partition_cache.test
    modified:
      mysql-test/include/query_cache.inc
      mysql-test/r/cache_innodb.result
      sql/ha_partition.cc
      sql/ha_partition.h
=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2011-11-30 14:39:29 +0000
+++ b/mysys/stacktrace.c	2012-03-06 12:30:30 +0000
@@ -170,7 +170,7 @@ void my_print_stacktrace(uchar* stack_bo
     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"

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-11-30 16:11:13 +0000
+++ b/sql/mysqld.cc	2012-03-06 12:30:30 +0000
@@ -2468,10 +2468,6 @@ static void check_data_home(const char *
 
 #endif /*__WIN__ || __NETWARE */
 
-#ifdef HAVE_LINUXTHREADS
-#define UNSAFE_DEFAULT_LINUX_THREADS 200
-#endif
-
 
 #if BACKTRACE_DEMANGLE
 #include <cxxabi.h>

=== modified file 'sql/signal_handler.cc'
--- a/sql/signal_handler.cc	2011-11-30 14:39:29 +0000
+++ b/sql/signal_handler.cc	2012-03-06 12:30:30 +0000
@@ -131,6 +131,7 @@ extern "C" sig_handler handle_fatal_sign
     "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(

No bundle (reason: useless for push emails).