From d9d6d4b0e7298f1d446f395562f19592f824014c Mon Sep 17 00:00:00 2001
From: unknown <vva@genie.(none)>
Date: Mon, 9 Sep 2002 14:40:24 +0500
Subject: [PATCH] fix bug for slave..

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
---
 BitKeeper/etc/logging_ok | 1 +
 mysys/thr_alarm.c        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 6318a413179..c61cab617ba 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -80,3 +80,4 @@ worm@altair.is.lan
 zak@balfor.local
 zak@linux.local
 zgreant@mysql.com
+vva@genie.(none)
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;