From 3a664472de14322bb635baeec59d9c8bec0026c2 Mon Sep 17 00:00:00 2001
From: "istruewing@chilla.local" <>
Date: Fri, 2 Feb 2007 10:01:44 +0100
Subject: [PATCH] After merge fix

---
 include/my_pthread.h | 1 -
 include/thr_alarm.h  | 1 +
 mysys/my_pthread.c   | 3 ---
 mysys/my_thr_init.c  | 4 ----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/include/my_pthread.h b/include/my_pthread.h
index 3bcb30cd1f1..14dbc9825d4 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -683,7 +683,6 @@ extern pthread_t shutdown_th, main_th, signal_th;
 #define THD_LIB_LT    4
 
 extern uint thd_lib_detected;
-extern uint thr_client_alarm;
 
 	/* statistics_xxx functions are for not essential statistic */
 
diff --git a/include/thr_alarm.h b/include/thr_alarm.h
index ef6aaf49f77..1d7ebbcb9f5 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -94,6 +94,7 @@ typedef struct st_alarm {
 } ALARM;
 
 extern uint thr_client_alarm;
+extern pthread_t alarm_thread;
 
 #define thr_alarm_init(A) (*(A))=0
 #define thr_alarm_in_use(A) (*(A)!= 0)
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 09685ba3e12..14ba6aabf0e 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -31,7 +31,6 @@
 #endif
 
 uint thd_lib_detected;
-uint thr_client_alarm;
 
 #ifndef my_pthread_setprio
 void my_pthread_setprio(pthread_t thread_id,int prior)
@@ -319,8 +318,6 @@ 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;
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index 34fa2e8aa7e..42f025c39f3 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -61,10 +61,6 @@ static uint get_thread_lib(void);
 my_bool my_thread_global_init(void)
 {
   thd_lib_detected= get_thread_lib();
-  if (thd_lib_detected == THD_LIB_LT)
-    thr_client_alarm= SIGALRM;
-  else
-    thr_client_alarm= SIGUSR1;
 
   if (pthread_key_create(&THR_KEY_mysys,0))
   {