diff options
| author | jani/jamppa@production.mysql.com <> | 2007-01-30 17:52:27 +0100 |
|---|---|---|
| committer | jani/jamppa@production.mysql.com <> | 2007-01-30 17:52:27 +0100 |
| commit | 0e9a64684d84e68d79d1036d7d6af7873013275f (patch) | |
| tree | b3ee358f5906df6c26015a18da7f9a34e7952361 /mysys | |
| parent | 0b4ee9e5b8cee5af84295d76345d917788ebe294 (diff) | |
| parent | b3523e398cb3eb4b391d60183da6ce2ac959c212 (diff) | |
| download | mariadb-git-0e9a64684d84e68d79d1036d7d6af7873013275f.tar.gz | |
Merge bk://localhost:5559
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 1 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 19766a2d195..fd716448e43 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -32,6 +32,7 @@ #endif uint thd_lib_detected; +uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 51b31f78a1c..5729f27b7a7 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -21,6 +21,7 @@ #include "mysys_priv.h" #include <m_string.h> +#include <signal.h> #ifdef THREAD #ifdef USE_TLS @@ -60,6 +61,10 @@ static uint get_thread_lib(void); my_bool my_thread_global_init(void) { thd_lib_detected= get_thread_lib(); + if (thd_lib_detected == THD_LIB_LT) + thr_client_alarm= SIGALRM; + else + thr_client_alarm= SIGUSR1; if (pthread_key_create(&THR_KEY_mysys,0)) { |