diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 0d095393e9f..a4df838aa46 100644
--- a/sql/mysqld.cc
+++ b/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_SERVER_ALARM))
+    if (pthread_kill(select_thread, thr_client_alarm))
       break;					// allready dead
 #endif
     set_timespec(abstime, 2);
@@ -2238,6 +2238,8 @@ static void init_signals(void)
 #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
@@ -3422,7 +3424,7 @@ int main(int argc, char **argv)
 #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_