bk commit into 5.1 tree (stewart:1.2756)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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, 2007-11-30 18:35:31+11:00, stewart@willster.(none) +3 -0
  Fix reading of non-compressed files around EOF on files not multiple of 32kb

  mysql-test/ndb/ndb_config_1_node.ini@stripped, 2007-11-30 18:35:25+11:00,
stewart@willster.(none) +3 -3
    Disable O_DIRECT and CompressedLCP/BAckup in slave as to get coverage (master has them
enabled)

  storage/ndb/src/common/util/azio.c@stripped, 2007-11-30 18:35:25+11:00,
stewart@willster.(none) +12 -5
    fix minor problem on read failure

  storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp@stripped, 2007-11-30 18:35:26+11:00,
stewart@willster.(none) +1 -1
    return_value < 1 on read if azio_stream.z_eof==1

diff -Nrup a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
--- a/mysql-test/ndb/ndb_config_1_node.ini	2007-11-29 21:27:15 +11:00
+++ b/mysql-test/ndb/ndb_config_1_node.ini	2007-11-30 18:35:25 +11:00
@@ -16,9 +16,9 @@ FragmentLogFileSize= 6M
 DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory 
 
 # O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612
-ODirect= 1
-CompressedLCP= 1
-CompressedBackup= 1
+#ODirect= 1
+#CompressedLCP= 1
+#CompressedBackup= 1
 
 #
 # Increase timeouts to cater for slow test-machines
diff -Nrup a/storage/ndb/src/common/util/azio.c b/storage/ndb/src/common/util/azio.c
--- a/storage/ndb/src/common/util/azio.c	2007-11-29 16:02:38 +11:00
+++ b/storage/ndb/src/common/util/azio.c	2007-11-30 18:35:25 +11:00
@@ -442,6 +442,7 @@ int check_header(azio_stream *s)
   }
   else
   {
+    azseek(s,0,SEEK_SET);
     s->transparent = 1;
     s->z_err = Z_OK;
 
@@ -570,16 +571,22 @@ unsigned int ZEXPORT azread ( azio_strea
         s->stream.avail_out -= n;
         s->stream.avail_in  -= n;
       }
-      if (s->stream.avail_out > 0) 
+      if (s->stream.avail_out > 0)
       {
-        s->stream.avail_out -=
-          (uInt)my_read(s->file, (uchar *)next_out, s->stream.avail_out, MYF(0));
+        size_t bytes_read;
+        bytes_read= my_read(s->file, (uchar *)next_out, s->stream.avail_out,
+                            MYF(0));
+        if(bytes_read>0)
+          s->stream.avail_out -= bytes_read;
+        if (bytes_read == 0)
+        {
+          s->z_eof = 1;
+          return 0;
+        }
       }
       len -= s->stream.avail_out;
       s->in  += len;
       s->out += len;
-      if (len == 0)
-        s->z_eof = 1;
       return len;
     }
 
diff -Nrup a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
--- a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp	2007-11-29 21:32:37 +11:00
+++ b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp	2007-11-30 18:35:26 +11:00
@@ -484,7 +484,7 @@ int PosixAsyncFile::readBuffer(Request *
     if (return_value == -1 && errno == EINTR) {
       DEBUG(ndbout_c("EINTR in read"));
       continue;
-    } else if (return_value < 1){
+    } else if (return_value < 1 && azf.z_eof!=1){
       if(my_errno==0 && errno==0 && error==0 &&
azf.z_err==Z_STREAM_END)
         break;
       DEBUG(ndbout_c("ERROR DURING %sRead: %d off: %d from
%s",(use_gz)?"gz":"",size,offset,theFileName.c_str()));