summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
authorvva@genie.(none) <>2002-09-09 14:40:24 +0500
committervva@genie.(none) <>2002-09-09 14:40:24 +0500
commit098f4afa91cf6385e887544072cdb07d41df046d (patch)
tree752c21016bc9a54e9ec125166f4e591efdf27ea8 /mysys/thr_alarm.c
parentc29fa93f54a7ac7dcbfc9c970fde5b62158df299 (diff)
downloadmariadb-git-098f4afa91cf6385e887544072cdb07d41df046d.tar.gz
fix bug for slave..
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r--mysys/thr_alarm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 11e6fa97ab6..5bf1bb643e6 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -688,7 +688,7 @@ 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)
+ if (alarm && alrm->crono)
{
KillTimer(NULL, alrm->crono);
alrm->crono = 0;