diff options
| author | unknown <istruewing@chilla.local> | 2007-01-29 17:20:18 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-29 17:20:18 +0100 |
| commit | d308799383bdbcaad568c9844b34708462dd74e7 (patch) | |
| tree | 9ecca7943a964140be08bdfb8a54f9b76b89e592 /include/thr_alarm.h | |
| parent | 9403c7ca67535aa2a7610c4887b6e9276f5cb333 (diff) | |
| parent | fddf3c397913f3254bd2adf0d1d7ad4cde586355 (diff) | |
| download | mariadb-git-d308799383bdbcaad568c9844b34708462dd74e7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into chilla.local:/home/mydev/mysql-4.1-axmrg
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
Manual merged
mysql-test/t/myisam.test:
Manual merged
Diffstat (limited to 'include/thr_alarm.h')
| -rw-r--r-- | include/thr_alarm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 7a10d6886ce..0c26a67acf4 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -25,11 +25,6 @@ extern "C" { #ifndef USE_ALARM_THREAD #define USE_ONE_SIGNAL_HAND /* One must call process_alarm */ #endif -#ifdef HAVE_LINUXTHREADS -#define THR_CLIENT_ALARM SIGALRM -#else -#define THR_CLIENT_ALARM SIGUSR1 -#endif #ifdef HAVE_rts_threads #undef USE_ONE_SIGNAL_HAND #define USE_ALARM_THREAD |