diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-03-23 14:57:55 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-03-23 14:57:55 +0200 |
| commit | 9a4b2e90815772a8d08a9b03aacc01c7faccc98c (patch) | |
| tree | b3f59b08ab54c03969ee2a4bb866f2cdc714b9a8 /sql/mysqld.cc | |
| parent | 55f991c24d584d57d21fd780f0e51fceb5e2321a (diff) | |
| parent | c80ac29ee23bbbd35f8dda16addd1a6f82cc32a5 (diff) | |
| download | mariadb-git-9a4b2e90815772a8d08a9b03aacc01c7faccc98c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 20f20a0a86b..903d49a468c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2062,6 +2062,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); @@ -3156,13 +3167,6 @@ int main(int argc, char **argv) MY_INIT(argv[0]); // init my_sys library & pthreads - /* Set signal used to kill MySQL */ -#if defined(SIGUSR2) - thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; -#else - thr_kill_signal= SIGINT; -#endif - #ifdef _CUSTOMSTARTUPCONFIG_ if (_cust_check_startup()) { |