bk commit into 5.1 tree (jonas:1.2503)

[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@stripped, 2007-03-21 15:36:23+01:00, jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  MERGE: 1.2403.15.16

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@stripped, 2007-03-21 15:36:20+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.25.2.2

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-03-21 15:36:20+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.100.3.3

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@stripped, 2007-03-21 15:36:20+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.46.1.1

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-03-21 15:36:20+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.131.1.2

# 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/mysql-5.1-new-ndb/RESYNC

--- 1.32/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-03-21 15:36:29 +01:00
+++ 1.33/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-03-21 15:36:29 +01:00
@@ -1645,6 +1645,8 @@
   // NR
   Uint32 c_dictLockSlavePtrI_nodeRestart; // userPtr for NR
   void recvDictLockConf_nodeRestart(Signal* signal, Uint32 data, Uint32 ret);
+
+  Uint32 c_error_7181_ref;
 };
 
 #if (DIH_CDATA_SIZE < _SYSFILE_SIZE32)

--- 1.113/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-21 15:36:29 +01:00
+++ 1.114/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-21 15:36:29 +01:00
@@ -5101,6 +5101,7 @@
   {
     ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");
     CLEAR_ERROR_INSERT_VALUE;
+    signal->theData[0] = c_error_7181_ref;
     signal->theData[1] = coldgcp;
     execGCP_TCFINISHED(signal);
   }
@@ -5176,6 +5177,7 @@
   {
     ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");
     CLEAR_ERROR_INSERT_VALUE;
+    signal->theData[0] = c_error_7181_ref;
     signal->theData[1] = coldgcp;
     execGCP_TCFINISHED(signal);
   }
@@ -8078,6 +8080,7 @@
   cgckptflag = false;
   emptyverificbuffer(signal, true);
   cgcpParticipantState = GCP_PARTICIPANT_COMMIT_RECEIVED;
+  signal->theData[0] = calcDihBlockRef(masterNodeId);
   signal->theData[1] = coldgcp;
   sendSignal(clocaltcblockref, GSN_GCP_NOMORETRANS, signal, 2, JBB);
   return;
@@ -8087,11 +8090,13 @@
 {
   jamEntry();
   CRASH_INSERTION(7007);
+  Uint32 retRef = signal->theData[0];
   Uint32 gci = signal->theData[1];
   ndbrequire(gci == coldgcp);
 
   if (ERROR_INSERTED(7181) || ERROR_INSERTED(7182))
   {
+    c_error_7181_ref = retRef; // Save ref
     ndbout_c("killing %d", refToNode(cmasterdihref));
     signal->theData[0] = 9999;
     sendSignal(numberToRef(CMVMI, refToNode(cmasterdihref)),
@@ -8103,7 +8108,7 @@
   signal->theData[0] = cownNodeId;
   signal->theData[1] = coldgcp;
   signal->theData[2] = cfailurenr;
-  sendSignal(cmasterdihref, GSN_GCP_NODEFINISH, signal, 3, JBB);
+  sendSignal(retRef, GSN_GCP_NODEFINISH, signal, 3, JBB);
 }//Dbdih::execGCP_TCFINISHED()
 
 /*****************************************************************************/

--- 1.50/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-03-21 15:36:29 +01:00
+++ 1.51/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-03-21 15:36:29 +01:00
@@ -1955,5 +1955,8 @@
   // those variables should be removed and exchanged for stack
   // variable communication.
   /**************************************************************************/
+
+  Uint32 c_gcp_ref;
 };
+
 #endif

--- 1.138/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-21 15:36:29 +01:00
+++ 1.139/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-21 15:36:29 +01:00
@@ -6886,6 +6886,7 @@
 void Dbtc::execGCP_NOMORETRANS(Signal* signal) 
 {
   jamEntry();
+  c_gcp_ref = signal->theData[0];
   tcheckGcpId = signal->theData[1];
   if (cfirstgcp != RNIL) {
     jam();
@@ -9934,6 +9935,7 @@
 
 void Dbtc::gcpTcfinished(Signal* signal) 
 {
+  signal->theData[0] = c_gcp_ref;
   signal->theData[1] = tcheckGcpId;
   sendSignal(cdihblockref, GSN_GCP_TCFINISHED, signal, 2, JBB);
 }//Dbtc::gcpTcfinished()