List:Commits« Previous MessageNext Message »
From:msvensson Date:February 20 2007 11:06am
Subject:bk commit into 5.0 tree (msvensson:1.2434) BUG#25807
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-02-20 12:06:04+01:00, msvensson@stripped +1 -0
  Bug#25807 LOAD DATA INFILE does not work with Pipes
   - Additional fix for io_cache_init being called on a closed file

  mysys/mf_iocache.c@stripped, 2007-02-20 12:06:02+01:00, msvensson@stripped +19 -15
    The file does not need to be open when init_io_cache is called
    so don't call my_tell in that case

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.65/mysys/mf_iocache.c	2007-02-13 22:35:28 +01:00
+++ 1.66/mysys/mf_iocache.c	2007-02-20 12:06:02 +01:00
@@ -170,24 +170,28 @@
   info->arg = 0;
   info->alloced_buffer = 0;
   info->buffer=0;
+  info->seek_not_done= 0;
 
-  pos= my_tell(file, MYF(0));
-  if ((pos == (my_off_t) -1) && (my_errno == ESPIPE))
+  if (file >= 0)
   {
-    /* 
-      This kind of object doesn't support seek() or tell().  Don't set a flag
-      that will make us again try to seek() later and fail.
-    */
-    info->seek_not_done= 0;
-    /*
-      Additionally, if we're supposed to start somewhere other than the
-      the beginning of whatever this file is, then somebody made a bad
-      assumption.
-    */
-    DBUG_ASSERT(seek_offset == 0);
+    pos= my_tell(file, MYF(0));
+    if ((pos == (my_off_t) -1) && (my_errno == ESPIPE))
+    {
+      /*
+         This kind of object doesn't support seek() or tell(). Don't set a
+         flag that will make us again try to seek() later and fail.
+      */
+      info->seek_not_done= 0;
+      /*
+        Additionally, if we're supposed to start somewhere other than the
+        the beginning of whatever this file is, then somebody made a bad
+        assumption.
+      */
+      DBUG_ASSERT(seek_offset == 0);
+    }
+    else
+      info->seek_not_done= test(seek_offset != pos);
   }
-  else
-    info->seek_not_done= test(file >= 0 && seek_offset != pos);
 
   info->disk_writes= 0;
 #ifdef THREAD
Thread
bk commit into 5.0 tree (msvensson:1.2434) BUG#25807msvensson20 Feb