bk commit into 5.0 tree (serg:1.2417)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-23 16:37:19+02:00, serg@stripped +2 -0
  Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
  into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
  MERGE: 1.1616.2877.70

  mysys/thr_alarm.c@stripped, 2007-03-23 16:35:20+02:00, serg@stripped +0 -0
    Auto merged
    MERGE: 1.44.2.7

  sql/mysqld.cc@stripped, 2007-03-23 16:37:15+02:00, serg@stripped +0 -0
    SCCS merged
    MERGE: 1.356.98.41

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.0-build/RESYNC

--- 1.53/mysys/thr_alarm.c	2007-03-23 16:37:30 +02:00
+++ 1.54/mysys/thr_alarm.c	2007-03-23 16:37:30 +02:00
@@ -77,10 +77,6 @@
   sigfillset(&full_signal_set);			/* Neaded to block signals */
   pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
   pthread_cond_init(&COND_alarm,NULL);
-  if (thd_lib_detected == THD_LIB_LT)
-    thr_client_alarm= SIGALRM;
-  else
-    thr_client_alarm= SIGUSR1;
 #ifndef USE_ALARM_THREAD
   if (thd_lib_detected != THD_LIB_LT)
 #endif

--- 1.598/sql/mysqld.cc	2007-03-23 16:37:30 +02:00
+++ 1.599/sql/mysqld.cc	2007-03-23 16:37:30 +02:00
@@ -2180,6 +2180,17 @@
   struct sigaction sa;
   DBUG_ENTER("init_signals");
 
+  if (thd_lib_detected == THD_LIB_LT)
+  {
+    thr_client_alarm= SIGALRM;
+    thr_kill_signal= SIGINT;
+  }
+  else
+  {
+    thr_client_alarm= SIGUSR1;
+    thr_kill_signal= SIGUSR2;
+  }
+
   if (test_flags & TEST_SIGINT)
   {
     my_sigset(thr_kill_signal, end_thread_signal);
@@ -3420,13 +3431,6 @@
   /* ^^^  Nothing should be before this line! */
 
   DEBUGGER_OFF;
-
-  /* Set signal used to kill MySQL */
-#if defined(SIGUSR2)
-  thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
-#else
-  thr_kill_signal= SIGINT;
-#endif
 
 #ifdef _CUSTOMSTARTUPCONFIG_
   if (_cust_check_startup())