Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  SCCS merged

31 files changed, 22 insertions, 527 deletions

diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/ndb/include/kernel/GlobalSignalNumbers.h
index 08d35a0b0cb..1ffc198de41 100644
--- a/ndb/include/kernel/GlobalSignalNumbers.h
+++ b/ndb/include/kernel/GlobalSignalNumbers.h
@@ -540,13 +540,13 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 #define GSN_ABORT_ALL_REF               446
 #define GSN_ABORT_ALL_CONF              447
 
-#define GSN_STATISTICS_REQ              448
+/* 448 unused - formerly GSN_STATISTICS_REQ */
 #define GSN_STOP_ORD                    449
 #define GSN_TAMPER_ORD                  450
-#define GSN_SET_VAR_REQ                 451
-#define GSN_SET_VAR_CONF                452
-#define GSN_SET_VAR_REF                 453
-#define GSN_STATISTICS_CONF             454
+/* 451 unused - formerly GSN_SET_VAR_REQ  */
+/* 452 unused - formerly GSN_SET_VAR_CONF */
+/* 453 unused - formerly GSN_SET_VAR_REF  */
+/* 454 unused - formerly GSN_STATISTICS_CONF */
 
 #define GSN_START_ORD                   455
 /* 457 unused */
diff --git a/ndb/include/mgmapi/mgmapi.h b/ndb/include/mgmapi/mgmapi.h
index 2423048f98f..e5889a1ee6d 100644
--- a/ndb/include/mgmapi/mgmapi.h
+++ b/ndb/include/mgmapi/mgmapi.h
@@ -16,6 +16,8 @@
 #ifndef MGMAPI_H
 #define MGMAPI_H
 
+#define NDB_MGM_MAX_LOGLEVEL 15
+
 /**
  * @mainpage MySQL Cluster Management API
  *
diff --git a/ndb/include/util/OutputStream.hpp b/ndb/include/util/OutputStream.hpp
index 460915e12e7..35ef3c5fed4 100644
--- a/ndb/include/util/OutputStream.hpp
+++ b/ndb/include/util/OutputStream.hpp
@@ -42,10 +42,10 @@ public:
 
 class SocketOutputStream : public OutputStream {
   NDB_SOCKET_TYPE m_socket;
-  unsigned m_timeout;
+  unsigned m_timeout_ms;
 public:
-  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned writeTimeout = 1000);
-  
+  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned write_timeout_ms = 1000);
+
   int print(const char * fmt, ...);
   int println(const char * fmt, ...);
 };
diff --git a/ndb/src/common/debugger/signaldata/SignalNames.cpp b/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 9839fd32cf2..66e7a10cdb7 100644
--- a/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -380,15 +380,10 @@ const GsnName SignalNames [] = {
   ,{ GSN_TUP_WRITELOG_REQ,       "TUP_WRITELOG_REQ" }
   ,{ GSN_LQH_WRITELOG_REQ,       "LQH_WRITELOG_REQ" }
 
-  ,{ GSN_STATISTICS_REQ,         "STATISTICS_REQ" }
   ,{ GSN_START_ORD,              "START_ORD" }
   ,{ GSN_STOP_ORD,               "STOP_ORD" }
   ,{ GSN_TAMPER_ORD,             "TAMPER_ORD" }
-  ,{ GSN_SET_VAR_REQ,            "SET_VAR_REQ" }
-  ,{ GSN_SET_VAR_CONF,           "SET_VAR_CONF" }
-  ,{ GSN_SET_VAR_REF,            "SET_VAR_REF" }
-  ,{ GSN_STATISTICS_CONF,        "STATISTICS_CONF" }
-  
+
   ,{ GSN_EVENT_SUBSCRIBE_REQ,    "EVENT_SUBSCRIBE_REQ" }
   ,{ GSN_EVENT_SUBSCRIBE_CONF,   "EVENT_SUBSCRIBE_CONF" }
   ,{ GSN_EVENT_SUBSCRIBE_REF,    "EVENT_SUBSCRIBE_REF" }
diff --git a/ndb/src/common/util/OutputStream.cpp b/ndb/src/common/util/OutputStream.cpp
index cccd76eac2c..eada1452f02 100644
--- a/ndb/src/common/util/OutputStream.cpp
+++ b/ndb/src/common/util/OutputStream.cpp
@@ -42,16 +42,16 @@ FileOutputStream::println(const char * fmt, ...){
 }
 
 SocketOutputStream::SocketOutputStream(NDB_SOCKET_TYPE socket,
-				       unsigned timeout){
+				       unsigned write_timeout_ms){
   m_socket = socket;
-  m_timeout = timeout;
+  m_timeout_ms = write_timeout_ms;
 }
 
 int
 SocketOutputStream::print(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprint_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprint_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }
@@ -59,7 +59,7 @@ int
 SocketOutputStream::println(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprintln_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprintln_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index a9d9c991ca3..722352a7791 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -77,11 +77,7 @@ Cmvmi::Cmvmi(const Configuration & conf) :
   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, 
@@ -703,24 +699,6 @@ Cmvmi::execTEST_ORD(Signal * signal){
 #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();
@@ -839,7 +817,7 @@ void Cmvmi::execTAMPER_ORD(Signal* signal)
   // 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);
@@ -847,160 +825,6 @@ void Cmvmi::execTAMPER_ORD(Signal* signal)
 
 }//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 possibly Ndbcnt too
-  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:
-    theConfig.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:
-    theConfig.timeBetweenWatchDogCheck(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case StopOnError:
-    theConfig.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:
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
index e3a20795701..712e70039c9 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
@@ -55,20 +55,14 @@ private:
   void execSIZEALT_ACK(Signal* signal);
   void execTEST_ORD(Signal* signal);
 
-  void execSTATISTICS_REQ(Signal* signal);
   void execSTOP_ORD(Signal* signal);
   void execSTART_ORD(Signal* signal);
   void execTAMPER_ORD(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
-  void execSET_VAR_CONF(Signal* signal);
-  void execSET_VAR_REF(Signal* signal);
 
   void execDUMP_STATE_ORD(Signal* signal);
 
   void execEVENT_SUBSCRIBE_REQ(Signal *);
   void cancelSubscription(NodeId nodeId);
-  
-  void handleSET_VAR_REQ(Signal* signal);
 
   void execTESTSIG(Signal* signal);
   void execNODE_START_REP(Signal* signal);
diff --git a/ndb/src/kernel/blocks/dbacc/Dbacc.hpp b/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
index 43810a08ac7..02a7e69b684 100644
--- a/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+++ b/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
@@ -911,7 +911,6 @@ private:
   void execDROP_TAB_REQ(Signal* signal);
   void execFSREMOVECONF(Signal* signal);
   void execREAD_CONFIG_REQ(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
   void execDUMP_STATE_ORD(Signal* signal);
 
   // Statement blocks
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp b/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
index 024a32ca95c..80664e8911a 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
@@ -178,7 +178,6 @@ Dbacc::Dbacc(const class Configuration & conf):
   addRecSignal(GSN_DROP_TAB_REQ, &Dbacc::execDROP_TAB_REQ);
   addRecSignal(GSN_FSREMOVECONF, &Dbacc::execFSREMOVECONF);
   addRecSignal(GSN_READ_CONFIG_REQ, &Dbacc::execREAD_CONFIG_REQ, true);
-  addRecSignal(GSN_SET_VAR_REQ,  &Dbacc::execSET_VAR_REQ);
 
   initData();
 
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index 40af5a52c03..37f75d82710 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -11648,33 +11648,6 @@ Dbacc::execDUMP_STATE_ORD(Signal* signal)
 #endif
 }//Dbacc::execDUMP_STATE_ORD()
 
-void Dbacc::execSET_VAR_REQ(Signal* signal) 
-{
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  int val = setVarReq->value();
-
-
-  switch (var) {
-
-  case NoOfDiskPagesToDiskAfterRestartACC:
-    clblPagesPerTick = val;
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case NoOfDiskPagesToDiskDuringRestartACC:
-    // 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()
-
 void
 Dbacc::execREAD_PSUEDO_REQ(Signal* signal){
   jamEntry();
diff --git a/ndb/src/kernel/blocks/dbdih/Dbdih.hpp b/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
index e8f24876979..ba2d8a6522a 100644
--- a/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+++ b/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
@@ -693,7 +693,6 @@ private:
   void execFSREADREF(Signal *);
   void execFSWRITECONF(Signal *);
   void execFSWRITEREF(Signal *);
-  void execSET_VAR_REQ(Signal *);
   void execCHECKNODEGROUPSREQ(Signal *);
   void execSTART_INFOREQ(Signal*);
   void execSTART_INFOREF(Signal*);
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
index 360f320cb74..6e456c9c841 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
@@ -216,7 +216,6 @@ Dbdih::Dbdih(const class Configuration & config):
   addRecSignal(GSN_FSREADREF, &Dbdih::execFSREADREF, true);
   addRecSignal(GSN_FSWRITECONF, &Dbdih::execFSWRITECONF);
   addRecSignal(GSN_FSWRITEREF, &Dbdih::execFSWRITEREF, true);
-  addRecSignal(GSN_SET_VAR_REQ, &Dbdih::execSET_VAR_REQ);
 
   addRecSignal(GSN_START_INFOREQ, 
                &Dbdih::execSTART_INFOREQ);
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 7810aa45d00..f85db9750b3 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -14028,30 +14028,6 @@ Dbdih::execNDB_TAMPER(Signal* signal)
   return;
 }//Dbdih::execNDB_TAMPER()
 
-void Dbdih::execSET_VAR_REQ(Signal* signal) {
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  int val = setVarReq->value();
-
-
-  switch (var) {
-  case TimeBetweenLocalCheckpoints:
-    c_lcpState.clcpDelay = val;
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case TimeBetweenGlobalCheckpoints:
-    cgcpDelay = val;
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  default:
-    sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);
-  } // switch
-#endif
-}
-
 void Dbdih::execBLOCK_COMMIT_ORD(Signal* signal){
   BlockCommitOrd* const block = (BlockCommitOrd *)&signal->theData[0];
 
diff --git a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index 817832bdfcb..40eb6a9c668 100644
--- a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -2201,7 +2201,6 @@ private:
   void execFSREADCONF(Signal* signal);
   void execFSREADREF(Signal* signal);
   void execSCAN_HBREP(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
   void execTIME_SIGNAL(Signal* signal);
   void execFSSYNCCONF(Signal* signal);
 
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 0b395e250c1..3452269be51 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -314,7 +314,6 @@ Dblqh::Dblqh(const class Configuration & conf):
   addRecSignal(GSN_FSREADCONF, &Dblqh::execFSREADCONF);
   addRecSignal(GSN_FSREADREF, &Dblqh::execFSREADREF, true);
   addRecSignal(GSN_ACC_ABORTCONF, &Dblqh::execACC_ABORTCONF);
-  addRecSignal(GSN_SET_VAR_REQ,  &Dblqh::execSET_VAR_REQ);
   addRecSignal(GSN_TIME_SIGNAL,  &Dblqh::execTIME_SIGNAL);
   addRecSignal(GSN_FSSYNCCONF,  &Dblqh::execFSSYNCCONF);
   addRecSignal(GSN_REMOVE_MARKER_ORD, &Dblqh::execREMOVE_MARKER_ORD);
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 6a439b24c03..7e920b2e7e4 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -18902,30 +18902,6 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal)
   
 }//Dblqh::execDUMP_STATE_ORD()
 
-void Dblqh::execSET_VAR_REQ(Signal* signal) 
-{
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-
-  switch (var) {
-
-  case NoOfConcurrentCheckpointsAfterRestart:
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case NoOfConcurrentCheckpointsDuringRestart:
-    // 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()
-
-
 /* **************************************************************** */
 /* ---------------------------------------------------------------- */
 /* ---------------------- TRIGGER HANDLING ------------------------ */
diff --git a/ndb/src/kernel/blocks/dbtc/Dbtc.hpp b/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
index d6c4529bb72..514cc2183aa 100644
--- a/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
+++ b/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
@@ -1323,7 +1323,6 @@ private:
   void execTIME_SIGNAL(Signal* signal);
   void execAPI_FAILREQ(Signal* signal);
   void execSCAN_HBREP(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
 
   void execABORT_ALL_REQ(Signal* signal);
 
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
index 0b46f598a89..73149f0b6fd 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
@@ -256,7 +256,6 @@ Dbtc::Dbtc(const class Configuration & conf):
   addRecSignal(GSN_INCL_NODEREQ, &Dbtc::execINCL_NODEREQ);
   addRecSignal(GSN_TIME_SIGNAL, &Dbtc::execTIME_SIGNAL);
   addRecSignal(GSN_API_FAILREQ, &Dbtc::execAPI_FAILREQ);
-  addRecSignal(GSN_SET_VAR_REQ, &Dbtc::execSET_VAR_REQ);
 
   addRecSignal(GSN_TC_COMMIT_ACK, &Dbtc::execTC_COMMIT_ACK);
   addRecSignal(GSN_ABORT_ALL_REQ, &Dbtc::execABORT_ALL_REQ);
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index 2b2e0e649a4..2afa077b672 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -10999,36 +10999,6 @@ Dbtc::execDUMP_STATE_ORD(Signal* signal)
   }
 }//Dbtc::execDUMP_STATE_ORD()
 
-void Dbtc::execSET_VAR_REQ(Signal* signal)
-{
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  int val = setVarReq->value();
-
-
-  switch (var) {
-
-  case TransactionInactiveTime:
-    jam();
-    set_appl_timeout_value(val);
-    break;
-  case TransactionDeadlockDetectionTimeout:
-    set_timeout_value(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case NoOfConcurrentProcessesHandleTakeover:
-    set_no_parallel_takeover(val);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  default:
-    sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);
-  } // switch
-#endif
-}
-
 void Dbtc::execABORT_ALL_REQ(Signal* signal)
 {
   jamEntry();
diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index 3079a530807..c78e7d9bced 100644
--- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -1116,7 +1116,6 @@ private:
   void execFSREADCONF(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 execFSREMOVECONF(Signal* signal);
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index f21f2eba9fc..0f83c45077b 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -103,7 +103,6 @@ Dbtup::Dbtup(const class Configuration & conf)
   addRecSignal(GSN_FSREADCONF, &Dbtup::execFSREADCONF);
   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);
@@ -1315,32 +1314,5 @@ void Dbtup::seizePendingFileOpenInfoRecord(PendingFileOpenInfoPtr& pfoiPtr)
   pfoiPtr.p->pfoNextRec = RNIL;
 }//Dbtup::seizePendingFileOpenInfoRecord()
 
-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()
-
-
 
 
diff --git a/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp b/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
index ec9d4a0dc60..80b0b29ea69 100644
--- a/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
+++ b/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
@@ -190,7 +190,6 @@ private:
   void execNDB_STARTCONF(Signal* signal);
   void execREAD_NODESREQ(Signal* signal);
   void execNDB_STARTREF(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
 
   void execSTOP_PERM_REF(Signal* signal);
   void execSTOP_PERM_CONF(Signal* signal);
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
index 6df52b6fbe7..fdd6e7677d3 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
@@ -80,7 +80,6 @@ Ndbcntr::Ndbcntr(const class Configuration & conf):
   addRecSignal(GSN_NDB_STARTCONF, &Ndbcntr::execNDB_STARTCONF);
   addRecSignal(GSN_READ_NODESREQ, &Ndbcntr::execREAD_NODESREQ);
   addRecSignal(GSN_NDB_STARTREF, &Ndbcntr::execNDB_STARTREF);
-  addRecSignal(GSN_SET_VAR_REQ, &Ndbcntr::execSET_VAR_REQ);
 
   addRecSignal(GSN_STOP_PERM_REF, &Ndbcntr::execSTOP_PERM_REF);
   addRecSignal(GSN_STOP_PERM_CONF, &Ndbcntr::execSTOP_PERM_CONF);
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 26e8f246293..87b71ba1c5f 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -2026,23 +2026,6 @@ Ndbcntr::execDUMP_STATE_ORD(Signal* signal)
 
 }//Ndbcntr::execDUMP_STATE_ORD()
 
-void Ndbcntr::execSET_VAR_REQ(Signal* signal) {
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-
-  switch (var) {
-  case TimeToWaitAlive:
-    // 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
-}//Ndbcntr::execSET_VAR_REQ()
-
 void Ndbcntr::updateNodeState(Signal* signal, const NodeState& newState) const{
   NodeStateRep * const stateRep = (NodeStateRep *)&signal->theData[0];
 
diff --git a/ndb/src/kernel/blocks/qmgr/Qmgr.hpp b/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
index dcca240eeb6..9d2ac80d905 100644
--- a/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+++ b/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
@@ -242,7 +242,6 @@ private:
   void execAPI_REGREQ(Signal* signal);
   void execAPI_FAILCONF(Signal* signal);
   void execREAD_NODESREQ(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
 
   void execREAD_NODESREF(Signal* signal);
   void execREAD_NODESCONF(Signal* signal);
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp b/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
index b8885569f0e..a087fe38c1c 100644
--- a/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
+++ b/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
@@ -82,7 +82,6 @@ Qmgr::Qmgr(const class Configuration & conf)
   addRecSignal(GSN_DISCONNECT_REP, &Qmgr::execDISCONNECT_REP);
   addRecSignal(GSN_API_FAILCONF, &Qmgr::execAPI_FAILCONF);
   addRecSignal(GSN_READ_NODESREQ, &Qmgr::execREAD_NODESREQ);
-  addRecSignal(GSN_SET_VAR_REQ,  &Qmgr::execSET_VAR_REQ);
   addRecSignal(GSN_API_BROADCAST_REP,  &Qmgr::execAPI_BROADCAST_REP);
   
   // Arbitration signals
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
index 0156f334051..c992ebe6cb9 100644
--- a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
@@ -4774,34 +4774,6 @@ Qmgr::execDUMP_STATE_ORD(Signal* signal)
 #endif
 }//Qmgr::execDUMP_STATE_ORD()
 
-void Qmgr::execSET_VAR_REQ(Signal* signal) 
-{
-#if 0
-  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];
-  ConfigParamId var = setVarReq->variable();
-  UintR val = setVarReq->value();
-
-  switch (var) {
-  case HeartbeatIntervalDbDb:
-    setHbDelay(val/10);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case HeartbeatIntervalDbApi:
-    setHbApiDelay(val/10);
-    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
-    break;
-
-  case ArbitTimeout:
-    setArbitTimeout(val);
-    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()
 
 void
 Qmgr::execAPI_BROADCAST_REP(Signal* signal)
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index fa7aed8b182..cacb55fe8fc 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -2187,43 +2187,6 @@ ndb_mgm_alloc_nodeid(NdbMgmHandle handle, unsigned int version, int nodetype,
   return nodeid;
 }
 
-/*****************************************************************************
- * Global Replication
- ******************************************************************************/
-extern "C"
-int 
-ndb_mgm_rep_command(NdbMgmHandle handle, unsigned int request,
-		    unsigned int* replication_id,
-		    struct ndb_mgm_reply* /*reply*/) 
-{
-  SET_ERROR(handle, NDB_MGM_NO_ERROR, "Executing: ndb_mgm_rep_command");
-  const ParserRow<ParserDummy> replication_reply[] = {
-    MGM_CMD("global replication reply", NULL, ""),
-    MGM_ARG("result", String, Mandatory, "Error message"),
-    MGM_ARG("id", Int, Optional, "Id of global replication"),
-    MGM_END()
-  };
-  CHECK_HANDLE(handle, -1);
-  CHECK_CONNECTED(handle, -1);
-
-  Properties args;
-  args.put("request", request);
-  const Properties *reply;
-  reply = ndb_mgm_call(handle, replication_reply, "rep", &args);
-  CHECK_REPLY(reply, -1);
-  
-  const char * result;
-  reply->get("result", &result);
-  reply->get("id", replication_id);
-  if(strcmp(result,"Ok")!=0) {
-    delete reply;
-    return -1;
-  }
-
-  delete reply;
-  return 0;
-}
-
 extern "C"
 int
 ndb_mgm_set_int_parameter(NdbMgmHandle handle,
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index 59f1487f7dc..62d2efd5b16 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -597,7 +597,6 @@ private:
    */
   enum WaitSignalType { 
     NO_WAIT,			// We don't expect to receive any signal
-    WAIT_SET_VAR,		// Accept SET_VAR_CONF and SET_VAR_REF
     WAIT_SUBSCRIBE_CONF 	// Accept event subscription confirmation
   };
   
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index a2dec949f67..01f71aa24f5 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -332,19 +332,6 @@ MgmApiSession::runSession()
 
     switch(ctx.m_status) {
     case Parser_t::UnknownCommand:
-#ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT
-      /* Backwards compatibility for old NDBs that still use
-       * the old "GET CONFIG" command.
-       */
-	  size_t i;
-      for(i=0; i<strlen(ctx.m_currentToken); i++)
-	ctx.m_currentToken[i] = toupper(ctx.m_currentToken[i]);
-
-      if(strncmp("GET CONFIG ", 
-		 ctx.m_currentToken,
-		 strlen("GET CONFIG ")) == 0)
-	getConfig_old(ctx);
-#endif /* MGM_GET_CONFIG_BACKWARDS_COMPAT */
       break;
     default:
       break;
@@ -359,32 +346,6 @@ MgmApiSession::runSession()
   DBUG_VOID_RETURN;
 }
 
-#ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT
-void
-MgmApiSession::getConfig_old(Parser_t::Context &ctx) {
-  Properties args;
-
-  Uint32 version, node;
-
-  if(sscanf(ctx.m_currentToken, "GET CONFIG %d %d",
-	    (int *)&version, (int *)&node) != 2) {
-    m_output->println("Expected 2 arguments for GET CONFIG");
-    return;
-  }
-
-  /* Put arguments in properties object so we can call the real function */  
-  args.put("version", version);
-  args.put("node", node);
-  getConfig_common(ctx, args, true);
-}
-#endif /* MGM_GET_CONFIG_BACKWARDS_COMPAT */
-
-void
-MgmApiSession::getConfig(Parser_t::Context &ctx, 
-			 const class Properties &args) {
-  getConfig_common(ctx, args);
-}
-
 static Properties *
 backward(const char * base, const Properties* reply){
   Properties * ret = new Properties();
@@ -560,9 +521,9 @@ MgmApiSession::get_nodeid(Parser_t::Context &,
 }
 
 void
-MgmApiSession::getConfig_common(Parser_t::Context &,
-				const class Properties &args,
-				bool compat) {
+MgmApiSession::getConfig(Parser_t::Context &,
+                         const class Properties &args)
+{
   Uint32 version, node = 0;
 
   args.get("version", &version);
@@ -576,47 +537,6 @@ MgmApiSession::getConfig_common(Parser_t::Context &,
     return;
   }
 
-  if(version > 0 && version < makeVersion(3, 5, 0) && compat){
-    Properties *reply = backward("", conf->m_oldConfig);
-    reply->put("Version", version);
-    reply->put("LocalNodeId", node);
-
-    backward("", reply);
-    //reply->print();
-    
-    const Uint32 size = reply->getPackedSize();
-    Uint32 *buffer = new Uint32[size/4+1];
-    
-    reply->pack(buffer);
-    delete reply;
-    
-    const int uurows = (size + 44)/45;
-    char * uubuf = new char[uurows * 62+5];
-      
-    const int uusz = uuencode_mem(uubuf, (char *)buffer, size);
-    delete[] buffer;
-      
-    m_output->println("GET CONFIG %d %d %d %d %d",
-		      0, version, node, size, uusz);
-    
-    m_output->println("begin 664 Ndb_cfg.bin");
-      
-    /* XXX Need to write directly to the socket, because the uubuf is not
-     * NUL-terminated. This could/should probably be done in a nicer way.
-     */
-    write_socket(m_socket, MAX_WRITE_TIMEOUT, uubuf, uusz);
-    delete[] uubuf;
-      
-    m_output->println("end");
-    m_output->println("");
-    return;
-  }
-
-  if(compat){
-    m_output->println("GET CONFIG %d %d %d %d %d",1, version, 0, 0, 0);
-    return;
-  }
-
   if(node != 0){
     bool compatible;
     switch (m_mgmsrv.getNodeType(node)) {
@@ -844,8 +764,7 @@ MgmApiSession::setClusterLogLevel(Parser<MgmApiSession>::Context &,
 
   DBUG_PRINT("enter",("node=%d, category=%d, level=%d", node, cat, level));
 
-  /* XXX should use constants for this value */
-  if(level > 15) {
+  if(level > NDB_MGM_MAX_LOGLEVEL) {
     m_output->println(reply);
     m_output->println("result: Invalid loglevel %d", level);
     m_output->println("");
@@ -889,8 +808,7 @@ MgmApiSession::setLogLevel(Parser<MgmApiSession>::Context &,
   args.get("category", &cat);
   args.get("level", &level);
 
-  /* XXX should use constants for this value */
-  if(level > 15) {
+  if(level > NDB_MGM_MAX_LOGLEVEL) {
     m_output->println("set loglevel reply");
     m_output->println("result: Invalid loglevel", errorString.c_str());
     m_output->println("");
@@ -1590,7 +1508,7 @@ MgmApiSession::listen_event(Parser<MgmApiSession>::Context & ctx,
     }
     
     int level = atoi(spec[1].c_str());
-    if(level < 0 || level > 15){
+    if(level < 0 || level > NDB_MGM_MAX_LOGLEVEL){
       msg.appfmt("Invalid level: >%s<", spec[1].c_str());
       result = -1;
       goto done;
diff --git a/ndb/src/mgmsrv/Services.hpp b/ndb/src/mgmsrv/Services.hpp
index 4d904e8369e..48ba55a8b12 100644
--- a/ndb/src/mgmsrv/Services.hpp
+++ b/ndb/src/mgmsrv/Services.hpp
@@ -24,9 +24,6 @@
 
 #include "MgmtSrvr.hpp"
 
-/** Undefine this to remove backwards compatibility for "GET CONFIG". */
-#define MGM_GET_CONFIG_BACKWARDS_COMPAT
-
 class MgmApiSession : public SocketServer::Session
 {
   static void stop_session_if_timed_out(SocketServer::Session *_s, void *data);
@@ -42,9 +39,6 @@ private:
   char m_err_str[1024];
   int m_stopSelf; // -1 is restart, 0 do nothing, 1 stop
 
-  void getConfig_common(Parser_t::Context &ctx,
-			const class Properties &args,
-			bool compat = false);
   const char *get_error_text(int err_no)
   { return m_mgmsrv.getErrorText(err_no, m_err_str, sizeof(m_err_str)); }
 
@@ -55,9 +49,6 @@ public:
 
   void getStatPort(Parser_t::Context &ctx, const class Properties &args);
   void getConfig(Parser_t::Context &ctx, const class Properties &args);
-#ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT
-  void getConfig_old(Parser_t::Context &ctx);
-#endif /* MGM_GET_CONFIG_BACKWARDS_COMPAT */
 
   void get_nodeid(Parser_t::Context &ctx, const class Properties &args);
   void getVersion(Parser_t::Context &ctx, const class Properties &args);