diff options
| author | monty@mashka.mysql.fi <> | 2003-11-17 12:59:07 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-11-17 12:59:07 +0200 |
| commit | ea337204cb201cd6f6588b93d9022fb7af132937 (patch) | |
| tree | b96141c19ab5d71bd011eabb282e32bfe27af863 /mysys | |
| parent | d0a21a0aeb883602345484a2015d6a4ad80d7f68 (diff) | |
| download | mariadb-git-ea337204cb201cd6f6588b93d9022fb7af132937.tar.gz | |
Safety fix for alarms on windows.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index f51f27b7f51..564d46aca3a 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -638,7 +638,8 @@ 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) + /* alrm may be zero if thr_alarm aborted with an error */ + if (alrm && alrm->crono) { KillTimer(NULL, alrm->crono); alrm->crono = 0; |