Merge naruto.:C:/cpp/bug23010/my50-bug23010

into  naruto.:C:/cpp/bug23010/my51-bug23010

2 files changed, 12 insertions, 3 deletions

diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index cd2a140182e..eb8b992c601 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -333,7 +333,11 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
     {
       info->read_end=info->write_pos;
       info->end_of_file=my_b_tell(info);
-      info->seek_not_done=1;
+      /*
+        Trigger a new seek only if we have a valid
+        file handle.
+      */
+      info->seek_not_done= (info->file != -1);
     }
     else if (type == WRITE_CACHE)
     {
diff --git a/mysys/my_seek.c b/mysys/my_seek.c
index e5b1905e551..239136c4e7c 100644
--- a/mysys/my_seek.c
+++ b/mysys/my_seek.c
@@ -29,8 +29,13 @@ my_off_t my_seek(File fd, my_off_t pos, int whence,
 		   whence, MyFlags));
   DBUG_ASSERT(pos != MY_FILEPOS_ERROR);		/* safety check */
 
-  if (-1 != fd)
-    newpos=lseek(fd, pos, whence);
+  /*
+      Make sure we are using a valid file descriptor!
+  */
+  DBUG_ASSERT(fd != -1);
+
+  newpos= lseek(fd, pos, whence);
+  
   if (newpos == (os_off_t) -1)
   {
     my_errno=errno;