bk commit into 4.1 tree (istruewing:1.2599)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-02 10:01:44+01:00, istruewing@stripped +4 -0
  After merge fix

  include/my_pthread.h@stripped, 2007-02-02 10:01:43+01:00, istruewing@stripped +0 -1
    After merge fix

  include/thr_alarm.h@stripped, 2007-02-02 10:01:43+01:00, istruewing@stripped +1 -0
    After merge fix

  mysys/my_pthread.c@stripped, 2007-02-02 10:01:43+01:00, istruewing@stripped +0 -3
    After merge fix

  mysys/my_thr_init.c@stripped, 2007-02-02 10:01:43+01:00, istruewing@stripped +0 -4
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-axmrg

--- 1.84/include/my_pthread.h	2007-02-02 10:01:48 +01:00
+++ 1.85/include/my_pthread.h	2007-02-02 10:01:48 +01:00
@@ -683,7 +683,6 @@ extern pthread_t shutdown_th, main_th, s
 #define THD_LIB_LT    4
 
 extern uint thd_lib_detected;
-extern uint thr_client_alarm;
 
 	/* statistics_xxx functions are for not essential statistic */
 

--- 1.19/include/thr_alarm.h	2007-02-02 10:01:48 +01:00
+++ 1.20/include/thr_alarm.h	2007-02-02 10:01:48 +01:00
@@ -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)

--- 1.45/mysys/my_pthread.c	2007-02-02 10:01:48 +01:00
+++ 1.46/mysys/my_pthread.c	2007-02-02 10:01:48 +01:00
@@ -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)
@@ -318,8 +317,6 @@ void sigwait_handle_sig(int sig)
   VOID(pthread_cond_signal(&COND_sigwait)); /* inform sigwait() about signal */
   pthread_mutex_unlock(&LOCK_sigwait);
 }
-
-extern pthread_t alarm_thread;
 
 void *sigwait_thread(void *set_arg)
 {

--- 1.31/mysys/my_thr_init.c	2007-02-02 10:01:48 +01:00
+++ 1.32/mysys/my_thr_init.c	2007-02-02 10:01:48 +01:00
@@ -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))
   {