Commit 0982a1d9 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 158ee61f 05e3b5f8
......@@ -337,7 +337,11 @@ 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;
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;
}
......
......@@ -51,6 +51,11 @@ 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)
{
......
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