diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-17 16:16:56 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-17 16:16:56 +0200 |
| commit | c072804d51c2941a955747afc0dae802e8843845 (patch) | |
| tree | e0405f8e1feebbfad15401394076809081f03f3f /mysys | |
| parent | e830279524127d05d65b57405cf77b1a0d5b5133 (diff) | |
| parent | d544ef768cec04122e7b4a558bc03b2da837815b (diff) | |
| download | mariadb-git-c072804d51c2941a955747afc0dae802e8843845.tar.gz | |
Merge with 3.23 (only comment changes)
BUILD/compile-pentium-gcov:
Use local file
mysys/thr_alarm.c:
Get comment from 3.23
sql/mini_client.cc:
Get comment from 3.23
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index bf40ffc5b4d..54aa4d421f6 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr) void thr_end_alarm(thr_alarm_t *alrm_ptr) { thr_alarm_t alrm= *alrm_ptr; + /* alrm may be zero if thr_alarm aborted with an error */ if (alrm && alrm->crono) + { KillTimer(NULL, alrm->crono); alrm->crono = 0; |