bk commit into 4.1 tree (thek:1.2583)

[kpettersson]

Below is the list of changes that have just been committed into a local
4.1 repository of thek. When thek 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, 2007-01-08 10:58:32+01:00, thek@stripped +2 -0
  Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my40-bug23010
  into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010
  MERGE: 1.1346.880.2

  mysys/mf_iocache.c@stripped, 2007-01-08 10:58:30+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.37.1.4

  mysys/my_seek.c@stripped, 2007-01-08 10:58:30+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.1

# 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:	thek
# Host:	kpdesk.mysql.com
# Root:	/home/thek/dev/bug23010/my41-bug23010/RESYNC

--- 1.51/mysys/mf_iocache.c	2007-01-08 10:58:36 +01:00
+++ 1.52/mysys/mf_iocache.c	2007-01-08 10:58:36 +01:00
@@ -337,7 +337,11 @@ my_bool reinit_io_cache(IO_CACHE *info, 
       if (info->type == READ_CACHE)
       {
 	info->write_end=info->write_buffer+info->buffer_length;
-	info->seek_not_done=1;
+        /*
+          Trigger a new seek only if we have a valid
+          file handle.
+        */
+        info->seek_not_done= (info->file >= 0);
       }
       info->end_of_file = ~(my_off_t) 0;
     }

--- 1.12/mysys/my_seek.c	2007-01-08 10:58:36 +01:00
+++ 1.13/mysys/my_seek.c	2007-01-08 10:58:36 +01:00
@@ -51,6 +51,11 @@ my_off_t my_seek(File fd, my_off_t pos, 
 		   whence, MyFlags));
   DBUG_ASSERT(pos != MY_FILEPOS_ERROR);		/* safety check */
 
+  /*
+    Make sure we are using a valid file descriptor
+  */
+  DBUG_ASSERT(fd >= 0);
+  
   newpos=lseek(fd, pos, whence);
   if (newpos == (os_off_t) -1)
   {