Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

mysys/thr_alarm.c

@@ -77,6 +77,10 @@ void init_thr_alarm(uint max_alarms)
   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

sql/mysqld.cc

@@ -704,7 +704,7 @@ static void close_connections(void)
     DBUG_PRINT("info",("Waiting for select thread"));
 
 #ifndef DONT_USE_THR_ALARM
-    if (pthread_kill(select_thread, thr_client_alarm))
+    if (pthread_kill(select_thread, THR_SERVER_ALARM))
       break;					// allready dead
 #endif
     set_timespec(abstime, 2);
@@ -2180,17 +2180,6 @@ static void init_signals(void)
   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);
@@ -2249,14 +2238,11 @@ static void init_signals(void)
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
-  sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
   {
     // May be SIGINT
     sigdelset(&set, thr_kill_signal);
   }
-  // For alarms
-  sigdelset(&set, thr_client_alarm);
   sigprocmask(SIG_SETMASK,&set,NULL);
   pthread_sigmask(SIG_SETMASK,&set,NULL);
   DBUG_VOID_RETURN;
@@ -3432,6 +3418,13 @@ int main(int argc, char **argv)
 
   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= thd_lib_detected == SIGINT;
+#endif
+  
 #ifdef _CUSTOMSTARTUPCONFIG_
   if (_cust_check_startup())
   {