diff options
author | unknown <thek@kpdesk.mysql.com> | 2007-01-09 12:28:46 +0100 |
---|---|---|
committer | unknown <thek@kpdesk.mysql.com> | 2007-01-09 12:28:46 +0100 |
commit | 9226a5ef7bed54aaf1de349adddb36e4c4013a39 (patch) | |
tree | 2e6d4c4760eff28884c17effe4658cb4d54faf13 | |
parent | 620ebf7e78c5fb837267678768f5c2d21c0ac112 (diff) | |
download | mariadb-git-9226a5ef7bed54aaf1de349adddb36e4c4013a39.tar.gz |
Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628
mysys/mf_iocache.c:
Exclude
mysys/my_seek.c:
Exclude
-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 5f0069d9bed..a7937da0cc2 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -313,11 +313,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 f47383b7ace..ec24a26b3d9 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -30,11 +30,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) { |