bzr commit into mysql-5.1-telco-7.0 branch (jonas:4190)

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4190 jonas oreland	2011-02-10
      ndb - more spj refactorings

    modified:
      storage/ndb/include/ndbapi/NdbTransaction.hpp
      storage/ndb/src/ndbapi/NdbOperationExec.cpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
=== modified file 'storage/ndb/include/ndbapi/NdbTransaction.hpp'
--- a/storage/ndb/include/ndbapi/NdbTransaction.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp	2011-02-10 08:10:20 +0000
@@ -976,9 +976,8 @@ private:						
   int 	sendCOMMIT();                   // Send a TC_COMMITREQ signal;
   void	setGCI(int GCI);		// Set the global checkpoint identity
  
-  int	OpCompleteFailure(NdbOperation*);
+  int	OpCompleteFailure();
   int	OpCompleteSuccess();
-  void	CompletedOperations();	        // Move active ops to list of completed
  
   void	OpSent();			// Operation Sent with success
   

=== modified file 'storage/ndb/src/ndbapi/NdbOperationExec.cpp'
--- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2011-02-10 08:10:20 +0000
@@ -497,7 +497,8 @@ NdbOperation::prepareSend(Uint32 aTC_Con
   tcKeyReq->setDirtyFlag(tReqInfo, tDirtyIndicator);
   tcKeyReq->setOperationType(tReqInfo, tOperationType);
   tcKeyReq->setKeyLength(tReqInfo, 0); // Not needed
-  
+  tcKeyReq->setViaSPJFlag(tReqInfo, 0);
+
   // A dirty read is always ignore error
   abortOption = tDirtyState ? (Uint8) AO_IgnoreError : (Uint8) abortOption;
   tcKeyReq->setAbortOption(tReqInfo, abortOption);
@@ -1743,7 +1744,7 @@ NdbOperation::receiveTCKEYREF(const NdbA
   // not dirty read
   if(! (theOperationType == ReadRequest && theDirtyIndicator))
   {
-    theNdbCon->OpCompleteFailure(this);
+    theNdbCon->OpCompleteFailure();
     return -1;
   }
   
@@ -1753,7 +1754,7 @@ NdbOperation::receiveTCKEYREF(const NdbA
    */
   if(theReceiver.m_expected_result_length)
   {
-    return theNdbCon->OpCompleteFailure(this);
+    return theNdbCon->OpCompleteFailure();
   }
   
   return -1;

=== modified file 'storage/ndb/src/ndbapi/NdbTransaction.cpp'
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp	2011-02-10 07:55:45 +0000
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp	2011-02-10 08:10:20 +0000
@@ -2177,7 +2177,7 @@ Parameters:    aErrorCode: The error cod
 Remark:        An operation was completed with failure.
 *******************************************************************************/
 int 
-NdbTransaction::OpCompleteFailure(NdbOperation* op)
+NdbTransaction::OpCompleteFailure()
 {
   Uint32 tNoComp = theNoOfOpCompleted;
   Uint32 tNoSent = theNoOfOpSent;

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.cpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp	2011-02-03 14:20:36 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp	2011-02-10 08:10:20 +0000
@@ -1340,7 +1340,6 @@ TransporterFacade::sendSignal(const NdbA
   if(setSignalLog() && TRACE_GSN(aSignal->theVerId_signalNumber)){
     SignalHeader tmp = * aSignal;
     tmp.theSendersBlockRef = numberToRef(aSignal->theSendersBlockRef, theOwnId);
-    LinearSectionPtr ptr[3];
     signalLogger.sendSignal(tmp,
                             1,
                             aSignal->getConstDataPtrSend(),

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.hpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp	2011-02-10 08:10:20 +0000
@@ -346,11 +346,11 @@ trp_client::getNodeInfo(Uint32 nodeId) c
 class LinearSectionIterator: public GenericSectionIterator
 {
 private :
-  Uint32* data;
+  const Uint32* data;
   Uint32 len;
   bool read;
 public :
-  LinearSectionIterator(Uint32* _data, Uint32 _len)
+  LinearSectionIterator(const Uint32* _data, Uint32 _len)
   {
     data= (_len == 0)? NULL:_data;
     len= _len;


Attachment: [text/bzr-bundle] bzr/[e-mail]