Merge with 4.0

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc
index 4b0575c8579..b7e2a803e42 100644
--- a/sql/mf_iocache.cc
+++ b/sql/mf_iocache.cc
@@ -70,13 +70,17 @@ int _my_b_net_read(register IO_CACHE *info, byte *Buffer,
   /* to set up stuff for my_b_get (no _) */
   info->read_end = (info->read_pos = (byte*) net->read_pos) + read_length;
   Buffer[0] = info->read_pos[0];		/* length is always 1 */
-  info->read_pos++;
 
   /*
     info->request_pos is used by log_loaded_block() to know the size
-    of the current block
+    of the current block.
+    info->pos_in_file is used by log_loaded_block() too.
   */
+  info->pos_in_file+= read_length;
   info->request_pos=info->read_pos;
+
+  info->read_pos++;
+
   DBUG_RETURN(0);
 }