diff options
author | unknown <thek@kpdesk.mysql.com> | 2007-01-11 15:23:34 +0100 |
---|---|---|
committer | unknown <thek@kpdesk.mysql.com> | 2007-01-11 15:23:34 +0100 |
commit | 4c50203d4bb57ed79f1e9c703c18d23c9f9d72da (patch) | |
tree | 7a74d1debcfc465235c4db825720aba20fec8eeb /mysys | |
parent | df3219a026aeb771370cd99e0e924921cad54eff (diff) | |
parent | 56e9169013682c71e5a42542146540f553907e39 (diff) | |
download | mariadb-git-4c50203d4bb57ed79f1e9c703c18d23c9f9d72da.tar.gz |
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
mysys/mf_iocache.c:
Auto merged
mysys/my_seek.c:
null merge.
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_iocache.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 25c8ceeff8b..fc81f0bad03 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -343,11 +343,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; } |