Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


BUILD/check-cpu:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
Makefile.am:
  Use local
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Use local
sql/mysqld.cc:
  Use local
strings/ctype-extra.c:
  SCCS merged

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;
     }