Commit 4c50203d authored by unknown's avatar unknown
Browse files

Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  null merge.
parents df3219a0 56e91690

mysys/mf_iocache.c

+1 −5
Original line number Diff line number Diff line
@@ -343,11 +343,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;

    }