diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
| commit | 077840fa23d65e1eb60fdd601802b151ff4b54b4 (patch) | |
| tree | 2c5744d9e9cf04714fcd0fe9214cfb40b2656b74 /mysys/my_pthread.c | |
| parent | 4fda992bff2034ff551d30cb5da742184ff4a3df (diff) | |
| parent | 454c763c6be44b34c8e1ff9b8561ab21e717b742 (diff) | |
| download | mariadb-git-077840fa23d65e1eb60fdd601802b151ff4b54b4.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
BUILD/SETUP.sh:
Merged from 4.0
configure.in:
Merged from 4.0
include/my_global.h:
Merged from 4.0
include/my_pthread.h:
Merged from 4.0
mysys/thr_alarm.c:
Merged from 4.0
sql/mysqld.cc:
Merged from 4.0
BUILD/SETUP.sh.rej:
Merged from 4.0
configure.in.rej:
Merged from 4.0
include/my_global.h.rej:
Merged from 4.0
include/my_pthread.h.rej:
Merged from 4.0
mysys/thr_alarm.c.rej:
Merged from 4.0
sql/mysqld.cc.rej:
Merged from 4.0
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 315e966bf43..49a1ea79f65 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -30,6 +30,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) { @@ -336,7 +338,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 */ |