Commit 9a4b2e90 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

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


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 55f991c2 c80ac29e

mysys/thr_alarm.c

+0 −4
Original line number Diff line number Diff line
@@ -78,10 +78,6 @@ 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

+11 −7
Original line number Diff line number Diff line
@@ -2062,6 +2062,17 @@ 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);
@@ -3156,13 +3167,6 @@ int main(int argc, char **argv) 


  MY_INIT(argv[0]);		// init my_sys library & pthreads



  /* Set signal used to kill MySQL */

#if defined(SIGUSR2)

  thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;

#else

  thr_kill_signal= SIGINT;

#endif



#ifdef _CUSTOMSTARTUPCONFIG_

  if (_cust_check_startup())

  {