Commit 75d91ded authored by thek@kpdesk.mysql.com's avatar thek@kpdesk.mysql.com

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

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
parents 1802d5aa 55558582
...@@ -338,11 +338,7 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type, ...@@ -338,11 +338,7 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
if (info->type == READ_CACHE) if (info->type == READ_CACHE)
{ {
info->write_end=info->write_buffer+info->buffer_length; info->write_end=info->write_buffer+info->buffer_length;
/* info->seek_not_done=1;
Trigger a new seek only if we have a valid
file handle.
*/
info->seek_not_done= (info->file >= 0);
} }
info->end_of_file = ~(my_off_t) 0; info->end_of_file = ~(my_off_t) 0;
} }
......
...@@ -51,11 +51,6 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, ...@@ -51,11 +51,6 @@ my_off_t my_seek(File fd, my_off_t pos, int whence,
whence, MyFlags)); whence, MyFlags));
DBUG_ASSERT(pos != MY_FILEPOS_ERROR); /* safety check */ 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); newpos=lseek(fd, pos, whence);
if (newpos == (os_off_t) -1) if (newpos == (os_off_t) -1)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment