summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
authorunknown <vva@genie.(none)>2002-09-09 14:40:24 +0500
committerunknown <vva@genie.(none)>2002-09-09 14:40:24 +0500
commitd9d6d4b0e7298f1d446f395562f19592f824014c (patch)
tree752c21016bc9a54e9ec125166f4e591efdf27ea8 /mysys/thr_alarm.c
parent41d0aee06ec842442ca234945e318409c5ea6b96 (diff)
downloadmariadb-git-d9d6d4b0e7298f1d446f395562f19592f824014c.tar.gz
fix bug for slave..
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
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;