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 /mysys | |
| 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
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 4 |
1 files changed, 0 insertions, 4 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 |