bk commit into 4.1 tree (thek:1.2543) BUG#23010

[kpettersson]

Below is the list of changes that have just been committed into a local
4.1 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-10 12:03:57+02:00, thek@stripped +3 -0
  Bug#23010 _my_b_read() passing illegal file handles to my_seek()
  - The io cache flag seek_not_done was not set properly in the reinit_
  io_cache function call and this led my_seek to be called despite an
  invalid file handle.
  - Added a test in reinit_io_cache to ensure we have a valid file handle
  before setting seek_not_done flag.

  BitKeeper/etc/ignore@stripped, 2006-10-10 12:03:55+02:00, thek@stripped +36 -0
    Added ndb/src/.libs/libndbclient.lai ndb/src/.libs/libndbclient.so ndb/src/.libs/libndbclient.so.0 ndb/src/.libs/libndbclient.so.0.0.0 tests/.libs/lt-mysql_client_test tests/.libs/mysql_client_test tools/.libs/mysqlmanager client/.libs/lt-mysql client/.libs/lt-mysqladmin client/.libs/lt-mysqlbinlog client/.libs/lt-mysqldump client/.libs/lt-mysqlimport client/.libs/lt-mysqltest client/.libs/mysql client/.libs/mysqladmin client/.libs/mysqlbinlog client/.libs/mysqlcheck client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqlmanager-pwgen client/.libs/mysqlmanagerc client/.libs/mysqlshow client/.libs/mysqltest libmysql/.libs/libmysqlclient.lai libmysql/.libs/libmysqlclient.so libmysql/.libs/libmysqlclient.so.14 libmysql/.libs/libmysqlclient.so.14.0.0 libmysql_r/.libs/libmysqlclient_r.lai libmysql_r/.libs/libmysqlclient_r.so libmysql_r/.libs/libmysqlclient_r.so.14 libmysql_r/.libs/libmysqlclient_r.so.14.0.0 to the ignore list

  mysys/mf_iocache.c@stripped, 2006-10-10 12:03:55+02:00, thek@stripped +5 -1
    Added a test to only trigger my_seek function calls if we have 
    a valid file descriptor. 

  mysys/my_seek.c@stripped, 2006-10-10 12:03:55+02:00, thek@stripped +5 -0
    Refactored incomplete condition into an assertion. This also ensures that
    variable newpos is initialized properly. 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	thek
# Host:	kpdesk.mysql.com
# Root:	/home/thek/dev/bug23010/my41-bug23010

--- 1.48/mysys/mf_iocache.c	2006-10-10 12:04:00 +02:00
+++ 1.49/mysys/mf_iocache.c	2006-10-10 12:04:00 +02:00
@@ -338,7 +338,11 @@
       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 != -1);
       }
       info->end_of_file = ~(my_off_t) 0;
     }

--- 1.11/mysys/my_seek.c	2006-10-10 12:04:00 +02:00
+++ 1.12/mysys/my_seek.c	2006-10-10 12:04:00 +02:00
@@ -29,6 +29,11 @@
 		   whence, MyFlags));
   DBUG_ASSERT(pos != MY_FILEPOS_ERROR);		/* safety check */
 
+  /*
+    Make sure we are using a valid file descriptor
+  */
+  DBUG_ASSERT(fd != -1);
+
   newpos=lseek(fd, pos, whence);
   if (newpos == (os_off_t) -1)
   {

--- 1.235/BitKeeper/etc/ignore	2006-10-10 12:04:00 +02:00
+++ 1.236/BitKeeper/etc/ignore	2006-10-10 12:04:00 +02:00
@@ -24,8 +24,13 @@
 .libs
 .o
 .out
+*.Po
 .snprj/*
 .vimrc
+.dep
+.deps
+*.Plo
+*.libs
 50
 =6
 BUILD/compile-pentium-maintainer
@@ -1059,3 +1064,34 @@
 vio/viotest-ssl
 libmysql/libmysql.ver
 libmysqld/sql_locale.cc
+ndb/src/.libs/libndbclient.lai
+ndb/src/.libs/libndbclient.so
+ndb/src/.libs/libndbclient.so.0
+ndb/src/.libs/libndbclient.so.0.0.0
+tests/.libs/lt-mysql_client_test
+tests/.libs/mysql_client_test
+tools/.libs/mysqlmanager
+client/.libs/lt-mysql
+client/.libs/lt-mysqladmin
+client/.libs/lt-mysqlbinlog
+client/.libs/lt-mysqldump
+client/.libs/lt-mysqlimport
+client/.libs/lt-mysqltest
+client/.libs/mysql
+client/.libs/mysqladmin
+client/.libs/mysqlbinlog
+client/.libs/mysqlcheck
+client/.libs/mysqldump
+client/.libs/mysqlimport
+client/.libs/mysqlmanager-pwgen
+client/.libs/mysqlmanagerc
+client/.libs/mysqlshow
+client/.libs/mysqltest
+libmysql/.libs/libmysqlclient.lai
+libmysql/.libs/libmysqlclient.so
+libmysql/.libs/libmysqlclient.so.14
+libmysql/.libs/libmysqlclient.so.14.0.0
+libmysql_r/.libs/libmysqlclient_r.lai
+libmysql_r/.libs/libmysqlclient_r.so
+libmysql_r/.libs/libmysqlclient_r.so.14
+libmysql_r/.libs/libmysqlclient_r.so.14.0.0