bk commit into 5.0 tree (jonas:1.2418)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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-02-19 20:33:37+01:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
  MERGE: 1.2216.70.44

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@stripped, 2007-02-19 20:33:34+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.14.1.1

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@stripped, 2007-02-19 20:33:34+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.13.1.1

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-02-19 20:33:34+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.55.1.13

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-19 20:33:34+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.97.1.1

  ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-02-19 20:33:34+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.24.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/mysql-5.0-ndb/RESYNC

--- 1.16/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-02-19 20:33:42 +01:00
+++ 1.17/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-02-19 20:33:42 +01:00
@@ -1366,6 +1366,7 @@
   Uint32 csystemnodes;
   Uint32 currentgcp;
   Uint32 c_newest_restorable_gci;
+  Uint32 c_set_initial_start_flag;
 
   enum GcpMasterTakeOverState {
     GMTOS_IDLE = 0,

--- 1.15/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2007-02-19 20:33:42 +01:00
+++ 1.16/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2007-02-19 20:33:42 +01:00
@@ -74,6 +74,7 @@
   c_blockCommit    = false;
   c_blockCommitNo  = 1;
   cntrlblockref    = RNIL;
+  c_set_initial_start_flag = FALSE;
 }//Dbdih::initData()
 
 void Dbdih::initRecords() 

--- 1.68/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-19 20:33:42 +01:00
+++ 1.69/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-19 20:33:42 +01:00
@@ -666,6 +666,12 @@
   {
     jam();
     memcpy(sysfileData, cdata, sizeof(sysfileData));
+
+    if (c_set_initial_start_flag)
+    {
+      jam();
+      Sysfile::setInitialStartOngoing(SYSFILE->systemRestartBits);
+    }
   }
 
   c_copyGCISlave.m_copyReason = reason;
@@ -1259,6 +1265,11 @@
     // The permission is given by the master node in the alive set.  
     /*-----------------------------------------------------------------------*/
     createMutexes(signal, 0);
+    if (cstarttype == NodeState::ST_INITIAL_NODE_RESTART)
+    {
+      jam();
+      c_set_initial_start_flag = TRUE; // In sysfile...
+    }
     break;
     
   case ZNDB_SPH3:
@@ -10284,6 +10295,17 @@
   
   sendSignal(c_lcpState.m_masterLcpDihRef, GSN_LCP_COMPLETE_REP, signal, 
 	     LcpCompleteRep::SignalLength, JBB);
+
+  /**
+   * Say that an initial node restart does not need to be redone
+   *   once node has been part of first LCP
+   */
+  if (c_set_initial_start_flag &&
+      c_lcpState.m_participatingLQH.get(getOwnNodeId()))
+  {
+    jam();
+    c_set_initial_start_flag = FALSE;
+  }
 }
 
 /*-------------------------------------------------------------------------- */

--- 1.99/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-19 20:33:42 +01:00
+++ 1.100/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-19 20:33:42 +01:00
@@ -11672,7 +11672,8 @@
     return;
   }
 
-  if(getNodeState().getNodeRestartInProgress()){
+  if(getNodeState().getNodeRestartInProgress() && cstartRecReq == ZFALSE)
+  {
     GCPSaveRef * const saveRef = (GCPSaveRef*)&signal->theData[0];
     saveRef->dihPtr = dihPtr;
     saveRef->nodeId = getOwnNodeId();

--- 1.27/ndb/test/ndbapi/testNodeRestart.cpp	2007-02-19 20:33:42 +01:00
+++ 1.28/ndb/test/ndbapi/testNodeRestart.cpp	2007-02-19 20:33:42 +01:00
@@ -1084,6 +1084,46 @@
   return NDBT_OK;
 }
 
+int 
+runBug26481(NDBT_Context* ctx, NDBT_Step* step)
+{
+  
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  NdbRestarter res;
+  
+  int node = res.getRandomNotMasterNodeId(rand());
+  ndbout_c("node: %d", node);
+  if (res.restartOneDbNode(node, true, true, true))
+    return NDBT_FAILED;
+
+  if (res.waitNodesNoStart(&node, 1))
+    return NDBT_FAILED;
+
+  int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+  if (res.dumpStateOneNode(node, val2, 2))
+    return NDBT_FAILED;
+
+  if (res.insertErrorInNode(node, 7018))
+    return NDBT_FAILED;
+
+  if (res.startNodes(&node, 1))
+    return NDBT_FAILED;
+
+  res.waitNodesStartPhase(&node, 1, 3);
+  
+  if (res.waitNodesNoStart(&node, 1))
+    return NDBT_FAILED;
+
+  res.startNodes(&node, 1);
+  
+  if (res.waitClusterStarted())
+    return NDBT_FAILED;
+  
+  return NDBT_OK;
+}
+
 NDBT_TESTSUITE(testNodeRestart);
 TESTCASE("NoLoad", 
 	 "Test that one node at a time can be stopped and then restarted "\
@@ -1407,6 +1447,9 @@
 }
 TESTCASE("Bug26457", ""){
   INITIALIZER(runBug26457);
+}
+TESTCASE("Bug26481", ""){
+  INITIALIZER(runBug26481);
 }
 NDBT_TESTSUITE_END(testNodeRestart);