Commit 819c1697 authored by unknown's avatar unknown
Browse files

Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
parents 94a2b704 d7e9fd07

mysys/mf_iocache.c

+1 −5
Original line number Diff line number Diff line
@@ -313,11 +313,7 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type, 
      if (info->type == READ_CACHE)

      {

	info->write_end=info->write_buffer+info->buffer_length;

        /*

          Trigger a new seek only if we have a valid

          file handle.

        */

        info->seek_not_done= (info->file >= 0);

	info->seek_not_done=1;

      }

      info->end_of_file = ~(my_off_t) 0;

    }

mysys/my_seek.c

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, 
		   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)

  {