bk commit into 4.1 tree (cmiller:1.2542)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
4.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-02 18:27:52-05:00, cmiller@stripped +1 -0
  Fix merge collision.

  mysys/mf_iocache.c@stripped, 2006-11-02 18:27:51-05:00, cmiller@stripped +4 -4
    Fix merge collision.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-4.1-maint

--- 1.50/mysys/mf_iocache.c	2006-11-02 18:27:55 -05:00
+++ 1.51/mysys/mf_iocache.c	2006-11-02 18:27:55 -05:00
@@ -963,13 +963,13 @@ int _my_b_read_r(register IO_CACHE *cach
           "seek_not_done" to indicate this to other functions operating
           on the IO_CACHE.
         */
-        if (info->seek_not_done)
+        if (cache->seek_not_done)
         {
-          if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0))
+          if (my_seek(cache->file,pos_in_file,MY_SEEK_SET,MYF(0))
               == MY_FILEPOS_ERROR)
           {
-            info->error= -1;
-            unlock_io_cache(info);
+            cache->error= -1;
+            unlock_io_cache(cache);
             DBUG_RETURN(1);
           }
         }