Commit ca20bc18 authored by unknown's avatar unknown
Browse files

Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build 

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  merged
parents f8eed3c1 27f8c357

mysql-test/t/wait_for_socket.sh

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ fi 


###########################################################################



client_args="--silent --socket=$socket_path --connect_timeout=1 "

client_args="--no-defaults --silent --socket=$socket_path --connect_timeout=1 "



[ -n "$username" ] && client_args="$client_args --user=$username "

[ -n "$password" ] && client_args="$client_args --password=$password "

sql/mysqld.cc

+2 −3
Original line number Diff line number Diff line
@@ -2346,14 +2346,13 @@ 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

    sigdelset(&set, thr_kill_signal);

  }

  // For alarms

  sigdelset(&set, thr_client_alarm);

  sigprocmask(SIG_SETMASK,&set,NULL);

  pthread_sigmask(SIG_SETMASK,&set,NULL);

  DBUG_VOID_RETURN;