bk commit into 5.1 tree (tomas:1.2014)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2014 06/04/26 17:05:57 tomas@stripped +3 -0
      Send TC_COMMIT_ACK uncond
      Fix printout of uncond signals

  storage/ndb/src/ndbapi/TransporterFacade.hpp
    1.30 06/04/26 17:05:48 tomas@stripped +2 -1
    Fix printout of uncond signals

  storage/ndb/src/ndbapi/TransporterFacade.cpp
    1.46 06/04/26 17:05:48 tomas@stripped +4 -3
    Fix printout of uncond signals

  storage/ndb/src/ndbapi/Ndbif.cpp
    1.36 06/04/26 17:05:48 tomas@stripped +2 -2
    Send TC_COMMIT_ACK uncond

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.35/storage/ndb/src/ndbapi/Ndbif.cpp	2006-03-24 17:11:39 +01:00
+++ 1.36/storage/ndb/src/ndbapi/Ndbif.cpp	2006-04-26 17:05:48 +02:00
@@ -1413,8 +1413,8 @@
   Uint32 * dataPtr = aSignal->getDataPtrSend();
   dataPtr[0] = transId1;
   dataPtr[1] = transId2;
-
-  tp->sendSignal(aSignal, refToNode(aTCRef));
+  
+  tp->sendSignalUnCond(aSignal, refToNode(aTCRef));
 }
 
 int

--- 1.45/storage/ndb/src/ndbapi/TransporterFacade.cpp	2006-03-24 17:11:39 +01:00
+++ 1.46/storage/ndb/src/ndbapi/TransporterFacade.cpp	2006-04-26 17:05:48 +02:00
@@ -990,7 +990,7 @@
       LinearSectionPtr ptr[3];
       signalLogger.sendSignal(* aSignal,
 			      1,
-			      aSignal->getDataPtr(),
+			      tDataPtr,
 			      aNode, ptr, 0);
       signalLogger.flushSignalLog();
       aSignal->theSendersBlockRef = tmp;
@@ -1017,6 +1017,7 @@
 
 int
 TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){
+  Uint32* tDataPtr = aSignal->getDataPtrSend();
 #ifdef API_TRACE
   if(setSignalLog() && TRACE_GSN(aSignal->theVerId_signalNumber)){
     Uint32 tmp = aSignal->theSendersBlockRef;
@@ -1024,7 +1025,7 @@
     LinearSectionPtr ptr[3];
     signalLogger.sendSignal(* aSignal,
 			    0,
-			    aSignal->getDataPtr(),
+			    tDataPtr,
 			    aNode, ptr, 0);
     signalLogger.flushSignalLog();
     aSignal->theSendersBlockRef = tmp;
@@ -1035,7 +1036,7 @@
          (aSignal->theReceiversBlockNumber != 0));
   SendStatus ss = theTransporterRegistry->prepareSend(aSignal, 
 						      0, 
-						      aSignal->getDataPtr(), 
+						      tDataPtr,
 						      aNode, 
 						      0);
   

--- 1.29/storage/ndb/src/ndbapi/TransporterFacade.hpp	2006-03-24 17:11:39 +01:00
+++ 1.30/storage/ndb/src/ndbapi/TransporterFacade.hpp	2006-04-26 17:05:48 +02:00
@@ -176,7 +176,8 @@
   friend class GrepSS;
   friend class Ndb;
   friend class Ndb_cluster_connection_impl;
-
+  friend class NdbConnection;
+  
   int sendSignalUnCond(NdbApiSignal *, NodeId nodeId);
 
   bool isConnected(NodeId aNodeId);