diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2007-03-29 19:31:42 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2007-03-29 19:31:42 +0300 |
| commit | b8d6c2e970f98bed2d936a8ae38aa9c4f4c40eb5 (patch) | |
| tree | 7d2400345350908d7d88b9a8df4cff268cc257db /mysys/thr_alarm.c | |
| parent | 28c122a7216c8c74edef7ab4d4a919ec31041d80 (diff) | |
| download | mariadb-git-b8d6c2e970f98bed2d936a8ae38aa9c4f4c40eb5.tar.gz | |
Merged from 5.0
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 57670c9ac14..471ec0ab10d 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -76,7 +76,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); - thr_client_alarm= thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1; + 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 |