diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2007-02-07 01:37:21 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2007-02-07 01:37:21 +0400 |
| commit | efc2771dde0c8407ac5b0dd8e83ac58ba8853076 (patch) | |
| tree | d528e3ead8992fb52e054d28992ba3843c068e9a /mysys/my_pthread.c | |
| parent | c52165de13ca62c2a596ea05c01e07807432d605 (diff) | |
| download | mariadb-git-efc2771dde0c8407ac5b0dd8e83ac58ba8853076.tar.gz | |
Excluded wrongly merged changeset.
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 2bfae397c85..844112991f6 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -29,8 +29,6 @@ #define SCHED_POLICY SCHED_OTHER #endif -uint thd_lib_detected; - #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) { @@ -314,6 +312,8 @@ void sigwait_handle_sig(int sig) pthread_mutex_unlock(&LOCK_sigwait); } +extern pthread_t alarm_thread; + void *sigwait_thread(void *set_arg) { sigset_t *set=(sigset_t*) set_arg; @@ -332,9 +332,7 @@ void *sigwait_thread(void *set_arg) sigaction(i, &sact, (struct sigaction*) 0); } } - /* Ensure that init_thr_alarm() is called */ - DBUG_ASSERT(thr_client_alarm); - sigaddset(set, 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 */ |