database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

fix bug for slave..

Browse Source 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2002-09-09 14:40:24 +05:00
parent 41d0aee06e
commit d9d6d4b0e7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -80,3 +80,4 @@ worm@altair.is.lan
zak@balfor.local zak@balfor.local
zak@linux.local zak@linux.local
zgreant@mysql.com zgreant@mysql.com
vva@genie.(none)

2
mysys/thr_alarm.c
View File

@@ -688,7 +688,7 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
void thr_end_alarm(thr_alarm_t *alrm_ptr) void thr_end_alarm(thr_alarm_t *alrm_ptr)
{ {
thr_alarm_t alrm= *alrm_ptr; thr_alarm_t alrm= *alrm_ptr;
if (alrm->crono) if (alarm && alrm->crono)
{ {
KillTimer(NULL, alrm->crono); KillTimer(NULL, alrm->crono);
alrm->crono = 0; alrm->crono = 0;