diff options
| author | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
| commit | 526b25e2633bbc44b867b548f5c7f633517e5b0f (patch) | |
| tree | 7815fb40163d1db39e3991dcd19341ef57d08d74 /mysys/mf_iocache.c | |
| parent | f6e33d67e1132a18e7a6ab49c2b6ff00da5112c8 (diff) | |
| parent | 922818a79809d789976e64a8b4faabd305863a7c (diff) | |
| download | mariadb-git-526b25e2633bbc44b867b548f5c7f633517e5b0f.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
Auto merged
BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
Auto merged
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
client/mysqldump.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/nt_servc.cc:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'mysys/mf_iocache.c')
| -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 d2c373ab0c6..288071f7361 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -506,7 +506,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); |