Commit 7be3cad4 authored by unknown's avatar unknown
Browse files

Merge bk://localhost:5559 

into  production.mysql.com:/usersnfs/jamppa/mysql-4.0


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 2ec2fa6d cdf6001a

include/my_pthread.h

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

mysys/my_pthread.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#endif



uint thd_lib_detected;

uint thr_client_alarm;



#ifndef my_pthread_setprio

void my_pthread_setprio(pthread_t thread_id,int prior)

mysys/my_thr_init.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include "mysys_priv.h"

#include <m_string.h>

#include <signal.h>



#ifdef THREAD

#ifdef USE_TLS
@@ -60,6 +61,10 @@ 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))

  {