Commit b99c4942 authored by tsmith@quadxeon.mysql.com's avatar tsmith@quadxeon.mysql.com

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/40
parents ab168f0e 929bdae3
......@@ -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)
......
......@@ -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))
{
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment