Commit 0fdd64ba authored by unknown's avatar unknown
Browse files

Merged from 5.0

parent 70e4ba1f

mysys/thr_alarm.c

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,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);

  thr_client_alarm= thd_lib_detected == THD_LIB_LT ?  SIGALRM : SIGUSR1;

  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

+2 −1
Original line number Diff line number Diff line
@@ -2351,6 +2351,7 @@ 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)

  {