From: Bernt M. Johnsen
Date: March 8 2012 9:45am
Subject: bzr push into mysql-trunk branch (bernt.johnsen:3730 to 3731) Bug#13793813
List-Archive: http://lists.mysql.com/commits/143133
X-Bug: 13793813
Message-Id: <201203080945.q289jP1G009582@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3731 Bernt M. Johnsen	2012-03-08
      Bug#13793813 Removing 3 debug lines from signal handler because there can be race conditions during shutdown (DBUG data structures have been destroyed)

    modified:
      sql/mysqld.cc
 3730 magnus.blaudd@stripped	2012-03-08
      The my_default_lc_messages variable was not exported by mysqld causing
      link error(undefined symbol) when compiling ha_archive as dynamic plugin on Windows.
      
      Change the my_default_lc_messags variable to be exported by mysqld using
      the MYSQL_PLUGIN_IMPORT macro.
      
      Approved via email by Svoj.

    modified:
      sql/sql_locale.h
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-03-06 12:56:57 +0000
+++ b/sql/mysqld.cc	2012-03-08 09:44:48 +0000
@@ -2705,7 +2705,6 @@ pthread_handler_t signal_hand(void *arg
   sigset_t set;
   int sig;
   my_thread_init();       // Init new thread
-  DBUG_ENTER("signal_hand");
   signal_thread_in_use= 1;
 
   /*
@@ -2771,10 +2770,8 @@ pthread_handler_t signal_hand(void *arg
       while ((error=my_sigwait(&set,&sig)) == EINTR) ;
     if (cleanup_done)
     {
-      DBUG_PRINT("quit",("signal_handler: calling my_thread_end()"));
       my_thread_end();
       signal_thread_in_use= 0;
-      DBUG_LEAVE;                               // Must match DBUG_ENTER()
       pthread_exit(0);        // Safety
       return 0;                                 // Avoid compiler warnings
     }

No bundle (reason: useless for push emails).