Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

BitKeeper/triggers/post-incoming

@@ -1,3 +0,0 @@
-#! /bin/sh
-
-echo "Test: post-incoming works"

BitKeeper/triggers/post-outgoing

@@ -1,3 +0,0 @@
-#! /bin/sh
-
-echo "Test: post-outgoing works"

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);