diff options
| author | monty@mashka.mysql.fi <> | 2003-11-18 18:54:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-11-18 18:54:27 +0200 |
| commit | a47d56088f15618158701c7d480c54551ae89603 (patch) | |
| tree | 21a08cbc0f6aecfbbbf13d5cac0d19bc67952322 /mysys | |
| parent | b60aea40588c02a531c8f62c20bf6472c90870b6 (diff) | |
| parent | 2846a16c57bff1cd22811656ad4a434f9342e5e8 (diff) | |
| download | mariadb-git-a47d56088f15618158701c7d480c54551ae89603.tar.gz | |
Merge with 4.0 tree
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 4 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 280b69b18bf..406b826382a 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -2038,7 +2038,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache, /* flush all key blocks for a file to disk, but don't do any mutex locks - flush_key_blocks() + flush_key_blocks_int() keycache pointer to a key cache data structure file handler for the file to flush to flush_type type of the flush @@ -2255,7 +2255,7 @@ restart: RETURN 0 ok 1 error - */ +*/ int flush_key_blocks(KEY_CACHE_HANDLE key_cache, File file, enum flush_type type) 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; |