Commit 62fdcb54 authored by unknown's avatar unknown
Browse files

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

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


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged
parents a94b1b50 7be3cad4

include/my_global.h

+1 −4
Original line number Diff line number Diff line
@@ -415,10 +415,7 @@ int __void__; 
#endif



/* Define some useful general macros */

#if defined(__cplusplus) && defined(__GNUC__)

#define max(a, b)     ((a) >? (b))

#define min(a, b)     ((a) <? (b))

#elif !defined(max)

#if !defined(max)

#define max(a, b)	((a) > (b) ? (a) : (b))

#define min(a, b)	((a) < (b) ? (a) : (b))

#endif

include/my_pthread.h

+9 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
extern "C" {

#endif /* __cplusplus */ 



/* Thread library */



#define THD_LIB_OTHER 1

#define THD_LIB_NPTL  2

#define THD_LIB_LT    4



extern uint thd_lib_detected;



#if defined(__WIN__) || defined(OS2)



#ifdef OS2
@@ -684,6 +676,15 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); 
*/

extern pthread_t shutdown_th, main_th, signal_th;



/* Which kind of thread library is in use */



#define THD_LIB_OTHER 1

#define THD_LIB_NPTL  2

#define THD_LIB_LT    4



extern uint thd_lib_detected;

extern uint thr_client_alarm;



	/* statistics_xxx functions are for not essential statistic */



#ifndef thread_safe_increment

include/thr_alarm.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ typedef struct st_alarm { 
  my_bool malloced;

} ALARM;



extern uint thr_client_alarm;



#define thr_alarm_init(A) (*(A))=0

#define thr_alarm_in_use(A) (*(A)!= 0)

void init_thr_alarm(uint max_alarm);

mysys/default.c

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, 
{

  char **ext;



  for (ext= (char**) f_extensions; *ext; *ext++)

  for (ext= (char**) f_extensions; *ext; ext++)

  {

    int error;

    if ((error= search_default_file_with_ext(args, alloc, dir, *ext,
@@ -709,7 +709,7 @@ void print_defaults(const char *conf_file, const char **groups) 
#endif

    for (dirs=default_directories ; *dirs; dirs++)

    {

      for (ext= (char**) f_extensions; *ext; *ext++)

      for (ext= (char**) f_extensions; *ext; ext++)

      {

	const char *pos;

	char *end;

mysys/my_pthread.c

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#endif



uint thd_lib_detected;

uint thr_client_alarm;



#ifndef my_pthread_setprio

void my_pthread_setprio(pthread_t thread_id,int prior)
@@ -338,7 +339,9 @@ void *sigwait_thread(void *set_arg) 
      sigaction(i, &sact, (struct sigaction*) 0);

    }

  }

  sigaddset(set, thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1);

  /* Ensure that init_thr_alarm() is called */

  DBUG_ASSERT(thr_client_alarm);

  sigaddset(set, thr_client_alarm);

  pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0);

  alarm_thread=pthread_self();			/* For thr_alarm */