Commit d03d2987 authored by unknown's avatar unknown
Browse files

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
parents cd4670a7 5305cd7c

include/my_pthread.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

include/thr_alarm.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

mysys/my_pthread.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

mysys/my_thr_init.c

+0 −4
Original line number Diff line number Diff line
@@ -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))

  {