diff options
| author | unknown <thek@kpdesk.mysql.com> | 2007-01-11 15:16:33 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2007-01-11 15:16:33 +0100 |
| commit | 56e9169013682c71e5a42542146540f553907e39 (patch) | |
| tree | 444349b5974f27f241b54034a55a757ae4cc97cc /mysys | |
| parent | 081b9c0e6b6824341c34cf253617fd26179f7ba6 (diff) | |
| parent | 819c1697836474eb6784f7c0f520c16d73ff5b40 (diff) | |
| download | mariadb-git-56e9169013682c71e5a42542146540f553907e39.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_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, 1 insertions, 10 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 00097d32dc0..a91002d3b4c 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -338,11 +338,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; } diff --git a/mysys/my_seek.c b/mysys/my_seek.c index f03a932e696..a9ae68cd5f0 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -51,11 +51,6 @@ 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) { |