mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
This commit is contained in:
unknown 2006-11-06 15:40:43 +01:00
commit 94a2b704a0
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysys/mf_iocache.c
View file

@ -313,7 +313,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;
}

5
mysys/my_seek.c
View file

@ -30,6 +30,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)
{