bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4886 to 4887)

[Jonas Oreland]

 4887 Jonas Oreland	2012-03-14
      ndb - add extra arguments (yet unused) to Dbtc::trigger_op_finished. To be used by FK

    modified:
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4886 magnus.blaudd@stripped	2012-03-14
      ndb
       - add const to variable only assigned once

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2012-01-17 15:21:49 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2012-03-14 10:00:46 +0000
@@ -1595,8 +1595,11 @@ private:
 			     TcConnectRecord* trigOp);
   void restoreTriggeringOpState(Signal* signal, 
 				TcConnectRecord* trigOp);
-  void trigger_op_finished(Signal* signal, ApiConnectRecordPtr,
-                           TcConnectRecord* triggeringOp);
+  void trigger_op_finished(Signal* signal,
+                           ApiConnectRecordPtr,
+                           Uint32 triggerPtrI,
+                           TcConnectRecord* triggeringOp,
+                           Uint32 returnCode);
   void continueTriggeringOp(Signal* signal, TcConnectRecord* trigOp);
 
   void executeTriggers(Signal* signal, ApiConnectRecordPtr* transPtr);

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-02-01 17:36:16 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-03-14 10:00:46 +0000
@@ -3537,7 +3537,7 @@ void Dbtc::attrinfoDihReceivedLab(Signal
       TcConnectRecordPtr opPtr;
       opPtr.i = trigOp;
       ptrCheckGuard(opPtr, ctcConnectFilesize, tcConnectRecord);
-      trigger_op_finished(signal, apiConnectptr, opPtr.p);
+      trigger_op_finished(signal, apiConnectptr, RNIL, opPtr.p, 0);
       return;
     }
     else
@@ -4517,8 +4517,8 @@ void Dbtc::execLQHKEYCONF(Signal* signal
   /**
    * And now decide what to do next
    */
-  if (regTcPtr->triggeringOperation != RNIL &&
-      !regApiPtr.p->isExecutingDeferredTriggers()) {
+  if (regTcPtr->triggeringOperation != RNIL)
+  {
     jam();
     // This operation was created by a trigger execting operation
     // Restart it if we have executed all it's triggers
@@ -4526,7 +4526,8 @@ void Dbtc::execLQHKEYCONF(Signal* signal
 
     opPtr.i = regTcPtr->triggeringOperation;
     ptrCheckGuard(opPtr, ctcConnectFilesize, localTcConnectRecord);
-    trigger_op_finished(signal, regApiPtr, opPtr.p);
+    trigger_op_finished(signal, regApiPtr, regTcPtr->currentTriggerId,
+                        opPtr.p, 0);
   } else if (noFired == 0) {
     // This operation did not fire any triggers, finish operation
     jam();
@@ -6348,7 +6349,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
         unlinkReadyTcCon(signal);
         releaseTcCon();
 
-        trigger_op_finished(signal, apiConnectptr, opPtr.p);
+        trigger_op_finished(signal, apiConnectptr, RNIL, opPtr.p, 0);
         return;
       }
       
@@ -15318,8 +15319,11 @@ void Dbtc::saveTriggeringOpState(Signal*
 }
 
 void
-Dbtc::trigger_op_finished(Signal* signal, ApiConnectRecordPtr regApiPtr,
-                          TcConnectRecord* triggeringOp)
+Dbtc::trigger_op_finished(Signal* signal,
+                          ApiConnectRecordPtr regApiPtr,
+                          Uint32 trigPtrI,
+                          TcConnectRecord* triggeringOp,
+                          Uint32 errCode)
 {
   if (!regApiPtr.p->isExecutingDeferredTriggers())
   {
@@ -15647,7 +15651,7 @@ void Dbtc::insertIntoIndexTable(Signal*
     jam();
     ndbrequire(tc_testbit(regApiPtr->m_flags,
                           ApiConnectRecord::TF_DEFERRED_CONSTRAINTS));
-    trigger_op_finished(signal, *transPtr, opRecord);
+    trigger_op_finished(signal, *transPtr, RNIL, opRecord, 0);
     return;
   }
 
@@ -15683,7 +15687,7 @@ void Dbtc::insertIntoIndexTable(Signal*
     {
       jam();
       releaseSection(keyIVal);
-      trigger_op_finished(signal, *transPtr, opRecord);
+      trigger_op_finished(signal, *transPtr, RNIL, opRecord, 0);
       return;
     }
     
@@ -15803,7 +15807,7 @@ void Dbtc::deleteFromIndexTable(Signal*
     jam();
     ndbrequire(tc_testbit(regApiPtr->m_flags,
                           ApiConnectRecord::TF_DEFERRED_CONSTRAINTS));
-    trigger_op_finished(signal, *transPtr, opRecord);
+    trigger_op_finished(signal, *transPtr, RNIL, opRecord, 0);
     return;
   }
 
@@ -15828,7 +15832,7 @@ void Dbtc::deleteFromIndexTable(Signal*
   {
     jam();
     releaseSection(keyIVal);
-    trigger_op_finished(signal, *transPtr, opRecord);
+    trigger_op_finished(signal, *transPtr, RNIL, opRecord, 0);
     return;
   }
 

No bundle (reason: useless for push emails).