Commit 098f4afa authored by vva@genie.(none)'s avatar vva@genie.(none)
Browse files

fix bug for slave..

parent c29fa93f

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -80,3 +80,4 @@ worm@altair.is.lan 
zak@balfor.local

zak@linux.local

zgreant@mysql.com

vva@genie.(none)

mysys/thr_alarm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;