Commit 5e23ea72 authored by tnurnberg@blasphemy.intern.azundris.com's avatar tnurnberg@blasphemy.intern.azundris.com
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/tnurnberg/21567/50-21567
parents 919f86fb 9928dac5

sql/mysqld.cc

+3 −5
Original line number Diff line number Diff line
@@ -2238,10 +2238,6 @@ static void init_signals(void) 
  struct sigaction sa;

  DBUG_ENTER("init_signals");



  if (test_flags & TEST_SIGINT)

  {

    my_sigset(thr_kill_signal, end_thread_signal);

  }

  my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!



  if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
@@ -2278,7 +2274,6 @@ static void init_signals(void) 
  (void) sigemptyset(&set);

  my_sigset(SIGPIPE,SIG_IGN);

  sigaddset(&set,SIGPIPE);

  sigaddset(&set,SIGINT);

#ifndef IGNORE_SIGHUP_SIGQUIT

  sigaddset(&set,SIGQUIT);

  sigaddset(&set,SIGHUP);
@@ -2300,9 +2295,12 @@ static void init_signals(void) 
    sigaddset(&set,THR_SERVER_ALARM);

  if (test_flags & TEST_SIGINT)

  {

    my_sigset(thr_kill_signal, end_thread_signal);

    // May be SIGINT

    sigdelset(&set, thr_kill_signal);

  }

  else

    sigaddset(&set,SIGINT);

  sigprocmask(SIG_SETMASK,&set,NULL);

  pthread_sigmask(SIG_SETMASK,&set,NULL);

  DBUG_VOID_RETURN;