From 6e1f446ae1f8484e069539c415818d9b9bd511e3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Mar 2007 13:38:42 +0200 Subject: move thr_client_alarm initialization to mysqld.cc (in thr_alarm.cc it happened too late). mysys/thr_alarm.c: move thr_client_alarm initialization to mysqld.cc (here it happened too late) sql/mysqld.cc: move thr_client_alarm initialization to mysqld.cc (in thr_alarm.cc it happened too late). moved thr_kill_signal initialization to init_signals() --- sql/mysqld.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a3263b50951..0e9131389c9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2046,6 +2046,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); @@ -3140,9 +3151,6 @@ int main(int argc, char **argv) MY_INIT(argv[0]); // init my_sys library & pthreads - /* Set signal used to kill MySQL */ - thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; - #ifdef _CUSTOMSTARTUPCONFIG_ if (_cust_check_startup()) { -- cgit v1.2.1