diff options
| author | unknown <thek@kpdesk.mysql.com> | 2007-01-11 14:04:01 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2007-01-11 14:04:01 +0100 |
| commit | 34f7ba874ef6dbd59b57340da412c843902db076 (patch) | |
| tree | b87daaa8d87b3126de121ef3a523c36313ca88d2 /mysys | |
| parent | 156c1b0dfb70ca5e1268fb340835846e7023c56d (diff) | |
| parent | e58a7bcd54407c9f76a39694ec69418bb13e8de6 (diff) | |
| download | mariadb-git-34f7ba874ef6dbd59b57340da412c843902db076.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_iocache.c | 6 | ||||
| -rw-r--r-- | mysys/my_seek.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index b17df3da260..c53a9585cfa 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -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; } diff --git a/mysys/my_seek.c b/mysys/my_seek.c index a9ae68cd5f0..f03a932e696 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -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) { |