Commit 27f8c357 authored by unknown's avatar unknown
Browse files

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

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


sql/mysqld.cc:
  Auto merged
parents 85e1718e a1e7490f

sql/mysqld.cc

+4 −2
Original line number Diff line number Diff line
@@ -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_