bk commit into 5.1 tree (jonas:1.2439)

[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-02-15 23:22:09+01:00, jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco
  into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
  MERGE: 1.2414.1.26

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-02-15 23:22:05+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.42.1.4

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-02-15 23:22:05+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.58.1.2

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2007-02-15 23:22:05+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.35.1.1

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@stripped, 2007-02-15 23:22:05+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.26.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/51-jonas/RESYNC

--- 1.44/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-02-15 23:22:14 +01:00
+++ 1.45/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-02-15 23:22:14 +01:00
@@ -78,11 +78,7 @@
   addRecSignal(GSN_OPEN_COMREQ,  &Cmvmi::execOPEN_COMREQ);
   addRecSignal(GSN_TEST_ORD,  &Cmvmi::execTEST_ORD);
 
-  addRecSignal(GSN_STATISTICS_REQ,  &Cmvmi::execSTATISTICS_REQ);
   addRecSignal(GSN_TAMPER_ORD,  &Cmvmi::execTAMPER_ORD);
-  addRecSignal(GSN_SET_VAR_REQ,  &Cmvmi::execSET_VAR_REQ);
-  addRecSignal(GSN_SET_VAR_CONF,  &Cmvmi::execSET_VAR_CONF);
-  addRecSignal(GSN_SET_VAR_REF,  &Cmvmi::execSET_VAR_REF);
   addRecSignal(GSN_STOP_ORD,  &Cmvmi::execSTOP_ORD);
   addRecSignal(GSN_START_ORD,  &Cmvmi::execSTART_ORD);
   addRecSignal(GSN_EVENT_SUBSCRIBE_REQ, 
@@ -764,24 +760,6 @@
 #endif
 }
 
-void Cmvmi::execSTATISTICS_REQ(Signal* signal) 
-{
-  // TODO Note ! This is only a test implementation...
-
-  static int stat1 = 0;
-  jamEntry();
-
-  //ndbout << "data 1: " << signal->theData[1];
-
-  int x = signal->theData[0];
-  stat1++;
-  signal->theData[0] = stat1;
-  sendSignal(x, GSN_STATISTICS_CONF, signal, 7, JBB);
-
-}//execSTATISTICS_REQ()
-
-
-
 void Cmvmi::execSTOP_ORD(Signal* signal) 
 {
   jamEntry();
@@ -900,7 +878,7 @@
   // to be able to indicate if we really introduced an error.
 #ifdef ERROR_INSERT
   TamperOrd* const tamperOrd = (TamperOrd*)&signal->theData[0];
-  
+  signal->theData[2] = 0;
   signal->theData[1] = tamperOrd->errorNo;
   signal->theData[0] = 5;
   sendSignal(DBDIH_REF, GSN_DIHNDBTAMPER, signal, 3,JBB);
@@ -908,160 +886,6 @@
 
 }//execTAMPER_ORD()
 
-
-
-void Cmvmi::execSET_VAR_REQ(Signal* signal) 
-{
-#if 0
-
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  jamEntry();
-  switch (var) {
-    
-    // NDBCNTR_REF
-    
-    // DBTC
-  case TransactionDeadlockDetectionTimeout:
-  case TransactionInactiveTime:
-  case NoOfConcurrentProcessesHandleTakeover:
-    sendSignal(DBTC_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-    
-    // DBDIH
-  case TimeBetweenLocalCheckpoints:
-  case TimeBetweenGlobalCheckpoints:
-    sendSignal(DBDIH_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-
-    // DBLQH
-  case NoOfConcurrentCheckpointsDuringRestart:
-  case NoOfConcurrentCheckpointsAfterRestart:
-    sendSignal(DBLQH_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-
-    // DBACC
-  case NoOfDiskPagesToDiskDuringRestartACC:
-  case NoOfDiskPagesToDiskAfterRestartACC:
-    sendSignal(DBACC_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-
-    // DBTUP
-  case NoOfDiskPagesToDiskDuringRestartTUP:
-  case NoOfDiskPagesToDiskAfterRestartTUP:
-    sendSignal(DBTUP_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-
-    // DBDICT
-
-    // NDBCNTR
-  case TimeToWaitAlive:
-
-    // QMGR
-  case HeartbeatIntervalDbDb: // TODO ev till Ndbcnt också
-  case HeartbeatIntervalDbApi:
-  case ArbitTimeout:
-    sendSignal(QMGR_REF, GSN_SET_VAR_REQ, signal, 3, JBB);
-    break;
-
-    // NDBFS
-
-    // CMVMI
-  case MaxNoOfSavedMessages:
-  case LockPagesInMainMemory:
-  case TimeBetweenWatchDogCheck:
-  case StopOnError:
-    handleSET_VAR_REQ(signal);
-    break;
-
-
-    // Not possible to update (this could of course be handled by each block
-    // instead but I havn't investigated where they belong)
-  case Id:
-  case ExecuteOnComputer:
-  case ShmKey:
-  case MaxNoOfConcurrentOperations:
-  case MaxNoOfConcurrentTransactions:
-  case MemorySpaceIndexes:
-  case MemorySpaceTuples:
-  case MemoryDiskPages:
-  case NoOfFreeDiskClusters:
-  case NoOfDiskClusters:
-  case NoOfFragmentLogFiles:
-  case NoOfDiskClustersPerDiskFile:
-  case NoOfDiskFiles:
-  case MaxNoOfSavedEvents:
-  default:
-
-    int mgmtSrvr = setVarReq->mgmtSrvrBlockRef();
-    sendSignal(mgmtSrvr, GSN_SET_VAR_REF, signal, 0, JBB);
-  } // switch
-
-#endif
-}//execSET_VAR_REQ()
-
-
-void Cmvmi::execSET_VAR_CONF(Signal* signal) 
-{
-  int mgmtSrvr = signal->theData[0];
-  sendSignal(mgmtSrvr, GSN_SET_VAR_CONF, signal, 0, JBB);
-
-}//execSET_VAR_CONF()
-
-
-void Cmvmi::execSET_VAR_REF(Signal* signal) 
-{
-  int mgmtSrvr = signal->theData[0];
-  sendSignal(mgmtSrvr, GSN_SET_VAR_REF, signal, 0, JBB);
-
-}//execSET_VAR_REF()
-
-
-void Cmvmi::handleSET_VAR_REQ(Signal* signal) {
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  int val = setVarReq->value();
-
-  switch (var) {
-  case MaxNoOfSavedMessages:
-    m_ctx.m_config.maxNoOfErrorLogs(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-    
-  case LockPagesInMainMemory:
-    int result;
-    if (val == 0) {
-      result = NdbMem_MemUnlockAll();
-    }
-    else {
-      result = NdbMem_MemLockAll();
-    }
-    if (result == 0) {
-      sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    }
-    else {
-      sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);
-    }
-    break;
-
-  case TimeBetweenWatchDogCheck:
-    m_ctx.m_config.timeBetweenWatchDogCheck(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case StopOnError:
-    m_ctx.m_config.stopOnError(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-    
-  default:
-    sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);
-    return;
-  } // switch
-#endif
-}
-
 #ifdef VM_TRACE
 class RefSignalTest {
 public:
@@ -1166,6 +990,24 @@
     }
   }
   
+  if (arg == DumpStateOrd::CmvmiDumpSubscriptions)
+  {
+    SubscriberPtr ptr;
+    subscribers.first(ptr);  
+    g_eventLogger.info("List subscriptions:");
+    while(ptr.i != RNIL)
+    {
+      g_eventLogger.info("Subscription: %u, nodeId: %u, ref: 0x%x",
+                         ptr.i,  refToNode(ptr.p->blockRef), ptr.p->blockRef);
+      for(Uint32 i = 0; i < LogLevel::LOGLEVEL_CATEGORIES; i++)
+      {
+        Uint32 level = ptr.p->logLevel.getLogLevel((LogLevel::EventCategory)i);
+        g_eventLogger.info("Category %u Level %u", i, level);
+      }
+      subscribers.next(ptr);
+    }
+  }
+
   if (arg == DumpStateOrd::CmvmiDumpLongSignalMemory){
     infoEvent("Cmvmi: g_sectionSegmentPool size: %d free: %d",
 	      g_sectionSegmentPool.getSize(),

--- 1.60/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-02-15 23:22:14 +01:00
+++ 1.61/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-02-15 23:22:14 +01:00
@@ -1474,7 +1474,6 @@
   void execTUP_ABORTREQ(Signal* signal);
   void execNDB_STTOR(Signal* signal);
   void execREAD_CONFIG_REQ(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
   void execDROP_TAB_REQ(Signal* signal);
   void execALTER_TAB_REQ(Signal* signal);
   void execTUP_DEALLOCREQ(Signal* signal);

--- 1.36/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2007-02-15 23:22:14 +01:00
+++ 1.37/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2007-02-15 23:22:14 +01:00
@@ -80,7 +80,6 @@
   addRecSignal(GSN_TUP_ABORTREQ, &Dbtup::execTUP_ABORTREQ);
   addRecSignal(GSN_NDB_STTOR, &Dbtup::execNDB_STTOR);
   addRecSignal(GSN_READ_CONFIG_REQ, &Dbtup::execREAD_CONFIG_REQ, true);
-  addRecSignal(GSN_SET_VAR_REQ,  &Dbtup::execSET_VAR_REQ);
 
   // Trigger Signals
   addRecSignal(GSN_CREATE_TRIG_REQ, &Dbtup::execCREATE_TRIG_REQ);
@@ -726,33 +725,6 @@
   regFragPtr.p->nextfreefrag = cfirstfreefrag;
   cfirstfreefrag = regFragPtr.i;
 }//Dbtup::releaseFragrec()
-
-void Dbtup::execSET_VAR_REQ(Signal* signal) 
-{
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)signal->getDataPtrSend();
-  ConfigParamId var = setVarReq->variable();
-  int val = setVarReq->value();
-
-  switch (var) {
-
-  case NoOfDiskPagesToDiskAfterRestartTUP:
-    clblPagesPerTick = val;
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case NoOfDiskPagesToDiskDuringRestartTUP:
-    // Valid only during start so value not set.
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  default:
-    sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);
-  } // switch
-#endif
-
-}//execSET_VAR_REQ()
-