diff options
| author | istruewing@chilla.local <> | 2007-01-29 18:47:46 +0100 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-01-29 18:47:46 +0100 |
| commit | 42bd03e2547d9f7739c754619b9cde10cb05d1b4 (patch) | |
| tree | d5baa9f433ccab67349d65f3e71a37dfb9ef45b2 /mysys/my_pthread.c | |
| parent | 45f61a06fbad3e41efcd4cd950a068e967a70bd3 (diff) | |
| parent | 79e099e8a6e0ffa055e75b738f1dc67689eb03d8 (diff) | |
| download | mariadb-git-42bd03e2547d9f7739c754619b9cde10cb05d1b4.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index fe3480ea10f..ce80dc014c2 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -29,6 +29,8 @@ #define SCHED_POLICY SCHED_OTHER #endif +uint thd_lib_detected; + #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) { @@ -335,7 +337,7 @@ void *sigwait_thread(void *set_arg) sigaction(i, &sact, (struct sigaction*) 0); } } - sigaddset(set,THR_CLIENT_ALARM); + sigaddset(set, thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1); pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0); alarm_thread=pthread_self(); /* For thr_alarm */ |