Commit a1e7490f authored by unknown's avatar unknown

nptl: typo fixed. sigaddset restored

parent d89329c6
...@@ -622,7 +622,7 @@ static void close_connections(void) ...@@ -622,7 +622,7 @@ static void close_connections(void)
DBUG_PRINT("info",("Waiting for select thread")); DBUG_PRINT("info",("Waiting for select thread"));
#ifndef DONT_USE_THR_ALARM #ifndef DONT_USE_THR_ALARM
if (pthread_kill(select_thread, THR_SERVER_ALARM)) if (pthread_kill(select_thread, thr_client_alarm))
break; // allready dead break; // allready dead
#endif #endif
set_timespec(abstime, 2); set_timespec(abstime, 2);
...@@ -2120,6 +2120,8 @@ static void init_signals(void) ...@@ -2120,6 +2120,8 @@ static void init_signals(void)
#ifdef SIGTSTP #ifdef SIGTSTP
sigaddset(&set,SIGTSTP); sigaddset(&set,SIGTSTP);
#endif #endif
if (thd_lib_detected != THD_LIB_LT)
sigaddset(&set,THR_SERVER_ALARM);
if (test_flags & TEST_SIGINT) if (test_flags & TEST_SIGINT)
{ {
// May be SIGINT // May be SIGINT
...@@ -3157,7 +3159,7 @@ int main(int argc, char **argv) ...@@ -3157,7 +3159,7 @@ int main(int argc, char **argv)
#if defined(SIGUSR2) #if defined(SIGUSR2)
thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
#else #else
thr_kill_signal= thd_lib_detected == SIGINT; thr_kill_signal= SIGINT;
#endif #endif
#ifdef _CUSTOMSTARTUPCONFIG_ #ifdef _CUSTOMSTARTUPCONFIG_
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment