Commit f5e2974c authored by joreland@mysql.com's avatar joreland@mysql.com

Made discless a config parameter instead of a env. variable

parent 2be8bc02
......@@ -74,6 +74,8 @@
#define CFG_LOGLEVEL_GREP 146
#define CFG_LOG_DESTINATION 147
#define CFG_DB_DISCLESS 148
#define CFG_NODE_ARBIT_RANK 200
#define CFG_NODE_ARBIT_DELAY 201
......
......@@ -888,6 +888,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
1,
0x7FFFFFFF },
{
CFG_DB_DISCLESS,
"Discless",
"DB",
"Run wo/ disk",
ConfigInfo::USED,
true,
ConfigInfo::BOOL,
0,
0,
1},
{
CFG_DB_ARBIT_TIMEOUT,
"ArbitrationTimeout",
......
......@@ -72,14 +72,15 @@ SimBlockList::load(const Configuration & conf){
SimulatedBlock * fs = 0;
{
char buf[100];
if(NdbEnv_GetEnv("NDB_NOFS", buf, 100) == 0){
fs = new (A_VALUE) Ndbfs(conf);
} else {
Uint32 dl;
const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){
fs = new (A_VALUE) VoidFs(conf);
} else {
fs = new (A_VALUE) Ndbfs(conf);
}
}
theList[0] = new (A_VALUE) Dbacc(conf);
theList[1] = new (A_VALUE) Cmvmi(conf);
theList[2] = fs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment