diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-03-23 20:39:34 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-03-23 20:39:34 +0200 |
| commit | 1e92dcae89a23040d332c7fe6ac2bf49708f38cb (patch) | |
| tree | 9de9aebecd4b67c298b172646815e6a4e8f18cbf /mysys | |
| parent | c62c0d9df8a8ae3c531a17c09aa7b2c172c6966d (diff) | |
| parent | d89329c68586b11984d86f3701f08c4a08f0a895 (diff) | |
| download | mariadb-git-1e92dcae89a23040d332c7fe6ac2bf49708f38cb.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:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index ea5afc31fa9..d11883a4ea4 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -77,6 +77,10 @@ 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 |