Commit 8bcc21c8 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M40/clone-4.0 

into  trift2.:/MySQL/M40/mysql-4.0
parents 774cddae 6f21a5af

include/config-win.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ typedef uint rf_SetTimer; 


/* Convert some simple functions to Posix */



#define sigset(A,B) signal((A),(B))

#define my_sigset(A,B) signal((A),(B))

#define finite(A) _finite(A)

#define sleep(A)  Sleep((A)*1000)

mysys/my_thr_init.c

+3 −0
Original line number Diff line number Diff line
@@ -60,11 +60,14 @@ static uint get_thread_lib(void); 


my_bool my_thread_global_init(void)

{

#if defined(SIGALRM) || defined(SIGUSR1)

  /* On Windows, these signals are not defined, but this whole part is not needed. */

  thd_lib_detected= get_thread_lib();

  if (thd_lib_detected == THD_LIB_LT)

    thr_client_alarm= SIGALRM;

  else

    thr_client_alarm= SIGUSR1;

#endif



  if (pthread_key_create(&THR_KEY_mysys,0))

  {

mysys/thr_alarm.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define ETIME ETIMEDOUT

#endif



uint thr_client_alarm;

static int alarm_aborted=1;			/* No alarm thread */

my_bool thr_alarm_inited= 0;

volatile my_bool alarm_thread_running= 0;