diff options
| author | istruewing@chilla.local <> | 2007-02-01 19:41:04 +0100 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-02-01 19:41:04 +0100 |
| commit | ed099870832bbb0ce0c4be13554e30e7adcd259c (patch) | |
| tree | fad720adc8764e80870fde40bfd0a6b860c73aa5 /mysys/my_pthread.c | |
| parent | 54bf789a6d1cca2277e80a98494f9e9a69f5ec02 (diff) | |
| parent | 5e5c1b761c084a328b70a658425811e2d028a57e (diff) | |
| download | mariadb-git-ed099870832bbb0ce0c4be13554e30e7adcd259c.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 844112991f6..a7bb75d25a8 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -29,6 +29,9 @@ #define SCHED_POLICY SCHED_OTHER #endif +uint thd_lib_detected; +uint thr_client_alarm; + #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) { @@ -332,7 +335,9 @@ void *sigwait_thread(void *set_arg) sigaction(i, &sact, (struct sigaction*) 0); } } - sigaddset(set,THR_CLIENT_ALARM); + /* Ensure that init_thr_alarm() is called */ + DBUG_ASSERT(thr_client_alarm); + sigaddset(set, thr_client_alarm); pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0); alarm_thread=pthread_self(); /* For thr_alarm */ |