bk commit into 5.1 tree (jonas:1.2119)

[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-20 14:51:39+01:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/drop5
  into  perch.ndb.mysql.com:/home/jonas/src/drop6
  MERGE: 1.2071.1.54

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-03-20 14:51:37+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.53.1.7

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-03-20 14:51:37+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.89.1.5

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2007-03-20 14:51:37+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.95.1.4

# 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/drop6/RESYNC

--- 1.56/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-20 14:51:43 +01:00
+++ 1.57/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-20 14:51:43 +01:00
@@ -4800,6 +4800,15 @@
   } else {
     ndbrequire(failedNodePtr.p->nodeStatus == NodeRecord::DYING);
   }//if
+
+  if (ERROR_INSERTED(7181))
+  {
+    ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");
+    CLEAR_ERROR_INSERT_VALUE;
+    signal->theData[1] = coldgcp;
+    execGCP_TCFINISHED(signal);
+  }
+  
   MasterGCPConf::State gcpState;
   switch (cgcpParticipantState) {
   case GCP_PARTICIPANT_READY:
@@ -4866,6 +4875,14 @@
     masterGCPConf->lcpActive[i] = SYSFILE->lcpActive[i];
   sendSignal(newMasterBlockref, GSN_MASTER_GCPCONF, signal, 
              MasterGCPConf::SignalLength, JBB);
+
+  if (ERROR_INSERTED(7182))
+  {
+    ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");
+    CLEAR_ERROR_INSERT_VALUE;
+    signal->theData[1] = coldgcp;
+    execGCP_TCFINISHED(signal);
+  }
 }//Dbdih::execMASTER_GCPREQ()
 
 void Dbdih::execMASTER_GCPCONF(Signal* signal) 
@@ -7575,10 +7592,10 @@
   } else if (cmasterState == MASTER_TAKE_OVER_GCP) {
     jam();
     //-------------------------------------------------------------
-    // We are currently taking over as master. We will delay the
-    // signal until we have completed the take over gcp handling.
+    // We are currently taking over as master. Ignore
+    // signal in this case since we will discover it in reception of 
+    // MASTER_GCPCONF.
     //-------------------------------------------------------------
-    sendSignalWithDelay(reference(), GSN_GCP_NODEFINISH, signal, 20, 3);
     return;
   } else {
     ndbrequire(cmasterState == MASTER_ACTIVE);
@@ -7724,6 +7741,15 @@
   CRASH_INSERTION(7007);
   Uint32 gci = signal->theData[1];
   ndbrequire(gci == coldgcp);
+
+  if (ERROR_INSERTED(7181) || ERROR_INSERTED(7182))
+  {
+    ndbout_c("killing %d", refToNode(cmasterdihref));
+    signal->theData[0] = 9999;
+    sendSignal(numberToRef(CMVMI, refToNode(cmasterdihref)),
+	       GSN_NDB_TAMPER, signal, 1, JBB);
+    return;
+  }
 
   cgcpParticipantState = GCP_PARTICIPANT_TC_FINISHED;
   signal->theData[0] = cownNodeId;

--- 1.93/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-20 14:51:43 +01:00
+++ 1.94/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-20 14:51:43 +01:00
@@ -11896,6 +11896,10 @@
     // Set the prev file to check if we shall close it.
     logFilePtr.i = logFilePtr.p->prevLogFile;
     ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
+
+    logPartPtr.i = logFilePtr.p->logPartRec;
+    ptrCheckGuard(logPartPtr, clogPartFileSize, logPartRecord);
+
     exitFromInvalidate(signal);
     return;
   case LogFileRecord::CLOSING_INIT:

--- 1.99/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-03-20 14:51:43 +01:00
+++ 1.100/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-03-20 14:51:43 +01:00
@@ -2331,15 +2331,6 @@
   ss.lock(); // lock will be released on exit
 
   NodeId nodeId = m_master_node;
-  if (okToSendTo(nodeId, false) != 0)
-  {
-    bool next;
-    nodeId = m_master_node = 0;
-    while((next = getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB)) == true &&
-          okToSendTo(nodeId, false) != 0);
-    if(!next)
-      return NO_CONTACT_WITH_DB_NODES;
-  }
 
   SimpleSignal ssig;
   BackupReq* req = CAST_PTR(BackupReq, ssig.getDataPtrSend());
@@ -2356,6 +2347,16 @@
   while (1) {
     if (do_send)
     {
+      if (okToSendTo(nodeId, false) != 0)
+      {
+	bool next;
+	nodeId = m_master_node = 0;
+	while((next = getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB)) == true &&
+	      okToSendTo(nodeId, false) != 0);
+	if(!next)
+	  return NO_CONTACT_WITH_DB_NODES;
+      }
+      
       if (ss.sendSignal(nodeId, &ssig) != SEND_OK) {
 	return SEND_OR_RECEIVE_FAILED;
       }