From b57a1dd22731b436c52bddd2fe4f368429ebb59c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Nov 2003 12:59:07 +0200 Subject: Safety fix for alarms on windows. mysys/thr_alarm.c: Safety fix for alarms on windows sql/mini_client.cc: Added comments --- mysys/thr_alarm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mysys') diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index f51f27b7f51..564d46aca3a 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -638,7 +638,8 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr) void thr_end_alarm(thr_alarm_t *alrm_ptr) { thr_alarm_t alrm= *alrm_ptr; - if (alrm->crono) + /* alrm may be zero if thr_alarm aborted with an error */ + if (alrm && alrm->crono) { KillTimer(NULL, alrm->crono); alrm->crono = 0; -- cgit v1.2.1