Commit 95108de5 authored by unknown's avatar unknown
Browse files

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

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


mysys/my_seek.c:
  Auto merged
parents ffd5de29 c6a67e69

mysys/mf_iocache.c

+5 −1
Original line number Diff line number Diff line
@@ -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)

    {

mysys/my_seek.c

+7 −2
Original line number Diff line number Diff line
@@ -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)

  /*

      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;