diff options
| author | unknown <serg@serg.mylan> | 2004-03-25 11:33:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-25 11:33:41 +0100 |
| commit | fb9b5fd9a494eb2b7b74ba8687c35ba9f7c27630 (patch) | |
| tree | 6902467ee379b418780ce93ad4a0f0d0860c3624 /mysys | |
| parent | 72ebff9d9d7255961f4e78c560c0788c281e1f36 (diff) | |
| parent | f72dd18af816a5171ad70076f9e9f7622db0916a (diff) | |
| download | mariadb-git-fb9b5fd9a494eb2b7b74ba8687c35ba9f7c27630.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_iocache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index c5bd7db9677..8fb93dc4780 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -481,7 +481,8 @@ static int lock_io_cache(IO_CACHE *info, my_off_t pos) while (!s->active || s->active->pos_in_file < pos) pthread_cond_wait(&s->cond, &s->mutex); - if (s->total < total) + if (s->total < total && + (!s->active || s->active->pos_in_file < pos)) return 1; pthread_mutex_unlock(&s->mutex); |