From db8a7b513cbbd3ae6c5d47cb904f7386f1215769 Mon Sep 17 00:00:00 2001
From: "svoj@mysql.com/april.(none)" <>
Date: Wed, 7 Feb 2007 01:37:21 +0400
Subject: Excluded wrongly merged changeset.

---
 mysys/my_pthread.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'mysys/my_pthread.c')

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 */
 
-- 
cgit v1.2.1