Merge chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged

4 files changed, 1 insertions, 8 deletions

diff --git a/include/my_pthread.h b/include/my_pthread.h
index 6ebde2f119c..f5c7ad62a16 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -771,7 +771,6 @@ extern uint my_thread_end_wait_time;
 #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 4127c9cb35e..fe0a8f21b92 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -93,6 +93,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 afdce8342a6..b9da9d4817a 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -30,7 +30,6 @@
 #endif
 
 uint thd_lib_detected;
-uint thr_client_alarm;
 
 #ifndef my_pthread_setprio
 void my_pthread_setprio(pthread_t thread_id,int prior)
@@ -318,8 +317,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 b364498fb48..67ab1e4a38a 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -80,10 +80,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))
   {