bk commit into 4.1 tree (serg:1.2628)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 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-24 14:03:27+02:00, serg@stripped +1 -0
  nptl: typo fixed. sigaddset restored

  sql/mysqld.cc@stripped, 2007-03-24 14:03:25+02:00, serg@stripped +4 -2
    nptl: typo fixed. sigaddset restored

# 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-4.1

--- 1.630/sql/mysqld.cc	2007-03-24 14:03:32 +02:00
+++ 1.631/sql/mysqld.cc	2007-03-24 14:03:32 +02:00
@@ -622,7 +622,7 @@
     DBUG_PRINT("info",("Waiting for select thread"));
 
 #ifndef DONT_USE_THR_ALARM
-    if (pthread_kill(select_thread, THR_SERVER_ALARM))
+    if (pthread_kill(select_thread, thr_client_alarm))
       break;					// allready dead
 #endif
     set_timespec(abstime, 2);
@@ -2120,6 +2120,8 @@
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
+  if (thd_lib_detected != THD_LIB_LT)
+    sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
   {
     // May be SIGINT
@@ -3157,7 +3159,7 @@
 #if defined(SIGUSR2)
   thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
 #else
-  thr_kill_signal= thd_lib_detected == SIGINT;
+  thr_kill_signal= SIGINT;
 #endif
   
 #ifdef _CUSTOMSTARTUPCONFIG_