bk commit into 5.0 tree (pekka:1.2170) BUG#18781

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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, 2006-07-10 13:44:15+02:00, pekka@stripped +5 -0
  ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)

  ndb/include/kernel/GlobalSignalNumbers.h@stripped, 2006-07-10 13:42:38+02:00, pekka@stripped +1 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/common/debugger/signaldata/SignalNames.cpp@stripped, 2006-07-10 13:42:38+02:00, pekka@stripped +2 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2006-07-10 13:42:38+02:00, pekka@stripped +7 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.cpp@stripped, 2006-07-10 13:42:38+02:00, pekka@stripped +6 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.hpp@stripped, 2006-07-10 13:42:38+02:00, pekka@stripped +1 -0
    5.0 : add NODE_START_REP from 5.1

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space_old/pekka/ndb/version/my50-1.2167.1.2

--- 1.11/ndb/include/kernel/GlobalSignalNumbers.h	2006-07-10 13:44:30 +02:00
+++ 1.12/ndb/include/kernel/GlobalSignalNumbers.h	2006-07-10 13:44:30 +02:00
@@ -587,6 +587,7 @@
 #define GSN_BLOCK_COMMIT_ORD            485
 #define GSN_UNBLOCK_COMMIT_ORD          486
 
+#define GSN_NODE_START_REP              502
 #define GSN_NODE_STATE_REP              487
 #define GSN_CHANGE_NODE_STATE_REQ       488
 #define GSN_CHANGE_NODE_STATE_CONF      489

--- 1.7/ndb/src/common/debugger/signaldata/SignalNames.cpp	2006-07-10 13:44:30 +02:00
+++ 1.8/ndb/src/common/debugger/signaldata/SignalNames.cpp	2006-07-10 13:44:30 +02:00
@@ -399,6 +399,8 @@
   ,{ GSN_TUP_COM_UNBLOCK,        "TUP_COM_UNBLOCK" }
   ,{ GSN_DUMP_STATE_ORD,         "DUMP_STATE_ORD" }
 
+  ,{ GSN_NODE_START_REP, "NODE_START_REP" }
+
   ,{ GSN_START_INFOREQ,  "START_INFOREQ" }
   ,{ GSN_START_INFOREF,  "START_INFOREF" }
   ,{ GSN_START_INFOCONF, "START_INFOCONF" }

--- 1.28/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-07-10 13:44:30 +02:00
+++ 1.29/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-07-10 13:44:30 +02:00
@@ -591,6 +591,13 @@
   Uint32 nodeId = signal->theData[0];
   c_startedNodes.set(nodeId);
   c_start.m_starting.clear(nodeId);
+
+  /**
+   * Inform all interested blocks that node has started
+   */
+  for(Uint32 i = 0; i<ALL_BLOCKS_SZ; i++){
+    sendSignal(ALL_BLOCKS[i].Ref, GSN_NODE_START_REP, signal, 1, JBB);
+  }
   
   if(!c_start.m_starting.isclear()){
     jam();

--- 1.23/ndb/src/kernel/vm/SimulatedBlock.cpp	2006-07-10 13:44:30 +02:00
+++ 1.24/ndb/src/kernel/vm/SimulatedBlock.cpp	2006-07-10 13:44:30 +02:00
@@ -148,6 +148,7 @@
   a[GSN_FSREMOVEREF]  = &SimulatedBlock::execFSREMOVEREF;
   a[GSN_FSSYNCREF]    = &SimulatedBlock::execFSSYNCREF;
   a[GSN_FSAPPENDREF]  = &SimulatedBlock::execFSAPPENDREF;
+  a[GSN_NODE_START_REP] = &SimulatedBlock::execNODE_START_REP;
 }
 
 void
@@ -911,6 +912,11 @@
   ContinueFragmented * sig = (ContinueFragmented*)signal->getDataPtrSend();
   sig->line = __LINE__;
   sendSignal(reference(), GSN_CONTINUE_FRAGMENTED, signal, 1, JBB);
+}
+
+void
+SimulatedBlock::execNODE_START_REP(Signal* signal)
+{
 }
 
 #ifdef VM_TRACE_TIME

--- 1.16/ndb/src/kernel/vm/SimulatedBlock.hpp	2006-07-10 13:44:30 +02:00
+++ 1.17/ndb/src/kernel/vm/SimulatedBlock.hpp	2006-07-10 13:44:30 +02:00
@@ -423,6 +423,7 @@
 
   void execSIGNAL_DROPPED_REP(Signal* signal);
   void execCONTINUE_FRAGMENTED(Signal* signal);
+  void execNODE_START_REP(Signal* signal);
 
   Uint32 c_fragmentIdCounter;
   ArrayPool<FragmentInfo> c_fragmentInfoPool;