Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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-14 16:03:25+11:00, stewart@willster.(none) +25 -0
BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/include/kernel/GlobalSignalNumbers.h@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +3 -3
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/common/debugger/signaldata/SignalNames.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -3
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -157
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -5
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -27
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/Dbdih.hpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -24
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -24
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -30
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -17
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/mgmsrv/MgmtSrvr.hpp@stripped, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
# 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: stewart
# Host: willster.(none)
# Root: /home/stewart/Documents/MySQL/5.0/ndb-work
--- 1.19/ndb/include/kernel/GlobalSignalNumbers.h 2007-02-14 15:55:06 +11:00
+++ 1.20/ndb/include/kernel/GlobalSignalNumbers.h 2007-02-14 16:03:22 +11:00
@@ -543,9 +543,9 @@
/* 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
+/* 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
--- 1.12/ndb/src/common/debugger/signaldata/SignalNames.cpp 2007-02-14 15:55:06 +11:00
+++ 1.13/ndb/src/common/debugger/signaldata/SignalNames.cpp 2007-02-14 16:03:22 +11:00
@@ -383,9 +383,6 @@
,{ 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_EVENT_SUBSCRIBE_REQ, "EVENT_SUBSCRIBE_REQ" }
,{ GSN_EVENT_SUBSCRIBE_CONF, "EVENT_SUBSCRIBE_CONF" }
--- 1.32/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2007-02-14 15:55:06 +11:00
+++ 1.33/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2007-02-14 16:03:22 +11:00
@@ -78,9 +78,6 @@
addRecSignal(GSN_TEST_ORD, &Cmvmi::execTEST_ORD);
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,
@@ -827,160 +824,6 @@
#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 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 {
--- 1.6/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp 2007-02-14 15:55:06 +11:00
+++ 1.7/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp 2007-02-14 16:03:22 +11:00
@@ -58,16 +58,11 @@
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);
--- 1.24/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2006-12-24 06:04:14 +11:00
+++ 1.25/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2007-02-14 16:03:22 +11:00
@@ -911,7 +911,6 @@
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
--- 1.17/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp 2006-12-24 06:04:14 +11:00
+++ 1.18/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp 2007-02-14 16:03:22 +11:00
@@ -178,7 +178,6 @@
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();
--- 1.61/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2006-12-24 06:04:14 +11:00
+++ 1.62/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2007-02-14 16:03:22 +11:00
@@ -11648,33 +11648,6 @@
#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();
--- 1.15/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2006-12-24 06:04:15 +11:00
+++ 1.16/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2007-02-14 16:03:22 +11:00
@@ -693,7 +693,6 @@
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.14/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2006-12-24 06:04:15 +11:00
+++ 1.15/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2007-02-14 16:03:22 +11:00
@@ -216,7 +216,6 @@
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);
--- 1.65/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-01-12 07:12:09 +11:00
+++ 1.66/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-02-14 16:03:22 +11:00
@@ -14026,30 +14026,6 @@
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.42/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2006-12-24 06:04:15 +11:00
+++ 1.43/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2007-02-14 16:03:23 +11:00
@@ -2201,7 +2201,6 @@
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.17/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2006-12-24 06:04:15 +11:00
+++ 1.18/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2007-02-14 16:03:23 +11:00
@@ -314,7 +314,6 @@
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);
--- 1.98/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-12-24 06:04:15 +11:00
+++ 1.99/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-02-14 16:03:23 +11:00
@@ -18902,30 +18902,6 @@
}//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 ------------------------ */
--- 1.38/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2007-01-06 01:33:32 +11:00
+++ 1.39/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2007-02-14 16:03:23 +11:00
@@ -1323,7 +1323,6 @@
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.14/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp 2006-12-24 06:04:15 +11:00
+++ 1.15/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp 2007-02-14 16:03:23 +11:00
@@ -256,7 +256,6 @@
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.103/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2006-12-28 05:36:09 +11:00
+++ 1.104/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-02-14 16:03:23 +11:00
@@ -10999,36 +10999,6 @@
}
}//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();
--- 1.29/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2006-12-24 06:04:15 +11:00
+++ 1.30/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2007-02-14 16:03:23 +11:00
@@ -1116,7 +1116,6 @@
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);
--- 1.21/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp 2006-12-24 06:04:15 +11:00
+++ 1.22/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp 2007-02-14 16:03:23 +11:00
@@ -103,7 +103,6 @@
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);
@@ -1314,33 +1313,6 @@
cfirstfreePfo = pfoiPtr.p->pfoNextRec;
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()
-
--- 1.7/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp 2006-12-24 06:04:16 +11:00
+++ 1.8/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp 2007-02-14 16:03:23 +11:00
@@ -190,7 +190,6 @@
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);
--- 1.10/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp 2006-12-24 06:04:16 +11:00
+++ 1.11/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp 2007-02-14 16:03:23 +11:00
@@ -80,7 +80,6 @@
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);
--- 1.35/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2006-12-24 06:04:16 +11:00
+++ 1.36/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2007-02-14 16:03:23 +11:00
@@ -2026,23 +2026,6 @@
}//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.13/ndb/src/kernel/blocks/qmgr/Qmgr.hpp 2007-01-12 07:12:09 +11:00
+++ 1.14/ndb/src/kernel/blocks/qmgr/Qmgr.hpp 2007-02-14 16:03:23 +11:00
@@ -242,7 +242,6 @@
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);
--- 1.9/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp 2006-12-24 06:04:16 +11:00
+++ 1.10/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp 2007-02-14 16:03:23 +11:00
@@ -82,7 +82,6 @@
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
--- 1.38/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2007-01-12 07:12:09 +11:00
+++ 1.39/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2007-02-14 16:03:23 +11:00
@@ -4774,34 +4774,6 @@
#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.49/ndb/src/mgmsrv/MgmtSrvr.hpp 2006-12-24 06:04:17 +11:00
+++ 1.50/ndb/src/mgmsrv/MgmtSrvr.hpp 2007-02-14 16:03:23 +11:00
@@ -597,7 +597,6 @@
*/
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
};
| Thread |
|---|
| • bk commit into 5.0 tree (stewart:1.2412) BUG#26358 | Stewart Smith | 14 Feb |
