diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-03-23 16:37:19 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-03-23 16:37:19 +0200 |
| commit | c62c0d9df8a8ae3c531a17c09aa7b2c172c6966d (patch) | |
| tree | b8fd0830d00a4f1eae58b1aa7274227949720c3e | |
| parent | 29bf3ad4fb83bba4d018c4a152fd0981a94ae6b1 (diff) | |
| parent | cc72a835d62473c068328bf094a8a49c8151a22a (diff) | |
| download | mariadb-git-c62c0d9df8a8ae3c531a17c09aa7b2c172c6966d.tar.gz | |
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
SCCS merged
| -rw-r--r-- | mysys/thr_alarm.c | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index d11883a4ea4..ea5afc31fa9 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -77,10 +77,6 @@ void init_thr_alarm(uint max_alarms) sigfillset(&full_signal_set); /* Neaded to block signals */ pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST); pthread_cond_init(&COND_alarm,NULL); - if (thd_lib_detected == THD_LIB_LT) - thr_client_alarm= SIGALRM; - else - thr_client_alarm= SIGUSR1; #ifndef USE_ALARM_THREAD if (thd_lib_detected != THD_LIB_LT) #endif diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 99d66134405..5dc29a48177 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2180,6 +2180,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); @@ -3421,13 +3432,6 @@ int main(int argc, char **argv) DEBUGGER_OFF; - /* 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()) { |