bk commit into 5.1 tree (jonas:1.2316)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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
  1.2316 06/04/18 15:21:39 jonas@stripped +2 -0
  ndb - replication
    Make sure that SUB_GCP_COMPLETE_ACK is sent uncond, failure to do so can lead to problems...

  storage/ndb/src/ndbapi/TransporterFacade.cpp
    1.50 06/04/18 15:21:36 jonas@stripped +1 -1
    Make sure that SUB_GCP_COMPLETE_ACK is sent uncond

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.31 06/04/18 15:21:36 jonas@stripped +9 -2
    retry on O_DIRECT

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.30/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-04-18 10:33:37 +02:00
+++ 1.31/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-04-18 15:21:36 +02:00
@@ -385,16 +385,23 @@
     }
     new_flags |= O_CREAT;
   }
-  
+
 no_odirect:
   if (-1 == (theFd = ::open(theFileName.c_str(), new_flags, mode))) 
   {
     PRINT_ERRORANDFLAGS(new_flags);
-    if ((errno == ENOENT ) && (new_flags & O_CREAT)) 
+    if ((errno == ENOENT) && (new_flags & O_CREAT)) 
     {
       createDirectories();
       if (-1 == (theFd = ::open(theFileName.c_str(), new_flags, mode))) 
       {
+#ifdef O_DIRECT
+	if (new_flags & O_DIRECT)
+	{
+	  new_flags &= ~O_DIRECT;
+	  goto no_odirect;
+	}
+#endif
         PRINT_ERRORANDFLAGS(new_flags);
         request->error = errno;
 	return;

--- 1.49/storage/ndb/src/ndbapi/TransporterFacade.cpp	2006-04-18 14:37:36 +02:00
+++ 1.50/storage/ndb/src/ndbapi/TransporterFacade.cpp	2006-04-18 15:21:36 +02:00
@@ -343,7 +343,7 @@
 	 Uint32 aNodeId= refToNode(ref);
 	 tSignal.theReceiversBlockNumber= refToBlock(ref);
 	 tSignal.theVerId_signalNumber= GSN_SUB_GCP_COMPLETE_ACK;
-	 theFacade->sendSignal(&tSignal, aNodeId);
+	 theFacade->sendSignalUnCond(&tSignal, aNodeId);
        }
        break;
      }