database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
This commit is contained in:
serg@janus.mylan
2007-03-28 15:47:48 +02:00
parent e5b660487b 1af6b027d6
commit 52ca332600
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/wait_for_socket.sh
View File

@ -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 "

3
sql/mysqld.cc
View File

@ -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;