fix bug for slave..

BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted

fix bug for slave..
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
744bfe7d · unknown · b2197260 · 744bfe7d · 744bfe7d
Commit 744bfe7d authored Sep 09, 2002 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

mysys/thr_alarm.c mysys/thr_alarm.c +1 -1

No files found.
--- 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)
--- 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;