List:Commits« Previous MessageNext Message »
From:tomas Date:February 14 2007 5:27pm
Subject:bk commit into 5.1 tree (tomas:1.2437)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2437 07/02/15 00:26:58 tomas@stripped +19 -0
  Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-merge

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.137 07/02/15 00:26:50 tomas@stripped +0 -0
    SCCS merged

  storage/ndb/src/mgmsrv/Services.cpp
    1.87 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
    1.56 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmapi/mgmapi.cpp
    1.86 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.55 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.15 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.22 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.47 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.60 07/02/15 00:24:38 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.21 07/02/15 00:24:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.49 07/02/15 00:24:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.138 07/02/15 00:24:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.60 07/02/15 00:24:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.106 07/02/15 00:24:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.28 07/02/15 00:24:36 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.46 07/02/15 00:24:36 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
    1.19 07/02/15 00:24:36 tomas@stripped +0 -0
    Auto merged

  storage/ndb/include/mgmapi/mgmapi.h
    1.63 07/02/15 00:24:36 tomas@stripped +0 -0
    Auto merged

  storage/ndb/include/kernel/GlobalSignalNumbers.h
    1.35 07/02/15 00:24:36 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-merge/RESYNC

--- 1.34/storage/ndb/include/kernel/GlobalSignalNumbers.h	2007-01-31 14:32:11 +07:00
+++ 1.35/storage/ndb/include/kernel/GlobalSignalNumbers.h	2007-02-15 00:24:36 +07:00
@@ -552,13 +552,13 @@ extern const GlobalSignalNumber NO_OF_SI
 #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 */

--- 1.62/storage/ndb/include/mgmapi/mgmapi.h	2007-01-24 12:20:34 +07:00
+++ 1.63/storage/ndb/include/mgmapi/mgmapi.h	2007-02-15 00:24:36 +07:00
@@ -20,6 +20,7 @@
 #include "ndb_logevent.h"
 
 #define MGM_LOGLEVELS CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1
+#define NDB_MGM_MAX_LOGLEVEL 15
 
 /**
  * @mainpage MySQL Cluster Management API

--- 1.18/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp	2007-01-24 12:20:34 +07:00
+++ 1.19/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp	2007-02-15 00:24:36 +07:00
@@ -350,15 +350,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" }

--- 1.45/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-02-14 15:57:49 +07:00
+++ 1.46/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-02-15 00:24:36 +07:00
@@ -78,11 +78,7 @@ Cmvmi::Cmvmi(Block_context& ctx) :
   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, 
@@ -730,24 +726,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();
@@ -866,167 +844,13 @@ void Cmvmi::execTAMPER_ORD(Signal* signa
   // 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);
 #endif
 
 }//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:
-    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 {

--- 1.27/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-02-06 04:13:43 +07:00
+++ 1.28/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2007-02-15 00:24:36 +07:00
@@ -700,7 +700,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*);

--- 1.105/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-14 15:57:50 +07:00
+++ 1.106/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-15 00:24:37 +07:00
@@ -14575,30 +14575,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];
 

--- 1.59/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-02-12 14:29:54 +07:00
+++ 1.60/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-02-15 00:24:37 +07:00
@@ -2169,7 +2169,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);
 

--- 1.137/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-12 14:29:55 +07:00
+++ 1.138/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-15 00:24:37 +07:00
@@ -62,6 +62,7 @@
 #include <signaldata/AttrInfo.hpp>
 #include <KeyDescriptor.hpp>
 #include <signaldata/RouteOrd.hpp>
+#include <signaldata/FsRef.hpp>
 
 // Use DEBUG to print messages that should be
 // seen only when we debug the product
@@ -11438,7 +11439,17 @@ void Dblqh::execLCP_PREPARE_CONF(Signal*
 
 void Dblqh::execBACKUP_FRAGMENT_REF(Signal* signal) 
 {
-  ndbrequire(false);
+  BackupFragmentRef *ref= (BackupFragmentRef*)signal->getDataPtr();
+  char buf[100];
+  BaseString::snprintf(buf,sizeof(buf),
+                       "Unable to store fragment during LCP. NDBFS Error: %u",
+                       ref->errorCode);
+
+  progError(__LINE__,
+            (ref->errorCode & FsRef::FS_ERR_BIT)?
+            NDBD_EXIT_AFS_UNKNOWN
+            : ref->errorCode,
+            buf);
 }
 
 void Dblqh::execBACKUP_FRAGMENT_CONF(Signal* signal) 
@@ -19249,30 +19260,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()
-
 
 /* **************************************************************** */
 /* ---------------------------------------------------------------- */

--- 1.48/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-02-12 14:29:55 +07:00
+++ 1.49/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-02-15 00:24:37 +07:00
@@ -1327,7 +1327,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);
 

--- 1.20/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2007-01-31 14:32:12 +07:00
+++ 1.21/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2007-02-15 00:24:37 +07:00
@@ -245,7 +245,6 @@ Dbtc::Dbtc(Block_context& ctx):
   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);

--- 1.136/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-02-12 14:29:55 +07:00
+++ 1.137/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-02-15 00:26:50 +07:00
@@ -11337,36 +11337,6 @@ Dbtc::match_and_print(Signal* signal, Ap
   return true;
 }
 
-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();

--- 1.59/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-02-06 04:13:43 +07:00
+++ 1.60/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-02-15 00:24:38 +07:00
@@ -1474,7 +1474,6 @@ private:
   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.46/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-02-12 14:29:55 +07:00
+++ 1.47/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-02-15 00:24:38 +07:00
@@ -2067,23 +2067,6 @@ Ndbcntr::execDUMP_STATE_ORD(Signal* sign
 
 }//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];
 

--- 1.21/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2007-02-12 14:29:55 +07:00
+++ 1.22/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2007-02-15 00:24:38 +07:00
@@ -250,7 +250,6 @@ private:
   void execAPI_REGREQ(Signal* signal);
   void execAPI_FAILCONF(Signal* signal);
   void execREAD_NODESREQ(Signal* signal);
-  void execSET_VAR_REQ(Signal* signal);
   void execAPI_FAILREQ(Signal* signal);
 
   void execREAD_NODESREF(Signal* signal);

--- 1.14/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2007-01-24 12:20:36 +07:00
+++ 1.15/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2007-02-15 00:24:38 +07:00
@@ -90,7 +90,6 @@ Qmgr::Qmgr(Block_context& ctx)
   addRecSignal(GSN_API_FAILREQ, &Qmgr::execAPI_FAILREQ);
   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);
 
   addRecSignal(GSN_NODE_FAILREP, &Qmgr::execNODE_FAILREP);

--- 1.54/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-02-12 14:29:55 +07:00
+++ 1.55/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-02-15 00:24:38 +07:00
@@ -5104,34 +5104,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)

--- 1.85/storage/ndb/src/mgmapi/mgmapi.cpp	2007-02-06 04:13:43 +07:00
+++ 1.86/storage/ndb/src/mgmapi/mgmapi.cpp	2007-02-15 00:24:38 +07:00
@@ -2235,43 +2235,6 @@ ndb_mgm_alloc_nodeid(NdbMgmHandle handle
   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,

--- 1.55/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2007-02-06 04:13:44 +07:00
+++ 1.56/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2007-02-15 00:24:38 +07:00
@@ -596,7 +596,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
   };
   

--- 1.86/storage/ndb/src/mgmsrv/Services.cpp	2007-02-06 04:13:44 +07:00
+++ 1.87/storage/ndb/src/mgmsrv/Services.cpp	2007-02-15 00:24:38 +07:00
@@ -349,19 +349,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;
@@ -382,32 +369,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();
@@ -584,9 +545,9 @@ MgmApiSession::get_nodeid(Parser_t::Cont
 }
 
 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);
@@ -600,47 +561,6 @@ MgmApiSession::getConfig_common(Parser_t
     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)) {
@@ -860,8 +780,7 @@ MgmApiSession::setClusterLogLevel(Parser
 
   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("");
@@ -904,8 +823,7 @@ MgmApiSession::setLogLevel(Parser<MgmApi
   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("");
@@ -1610,7 +1528,7 @@ MgmApiSession::listen_event(Parser<MgmAp
     }
     
     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;
Thread
bk commit into 5.1 tree (tomas:1.2437)tomas14 Feb