diff options
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 2 | ||||
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 8 | ||||
| -rw-r--r-- | ndb/src/common/mgmcommon/ConfigInfo.cpp | 18 |
4 files changed, 23 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8b86f88fda9..3516ff2a88f 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1449,7 +1449,7 @@ then if [ -z "$USE_RUNNING_NDBCLUSTER" ] then echo "Starting ndbcluster" - ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --discless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1 + ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1 export NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT" else export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER" diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index c7bba0bd3e4..312b2f8c4c0 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -3,7 +3,7 @@ NoOfReplicas: 2 MaxNoOfConcurrentOperations: CHOOSE_MaxNoOfConcurrentOperations DataMemory: CHOOSE_DataMemory IndexMemory: CHOOSE_IndexMemory -Discless: CHOOSE_Discless +Diskless: CHOOSE_Diskless [COMPUTER] Id: 1 diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index d05bc9a7a5b..3c5c715dde0 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -42,7 +42,7 @@ cfgfile=Ndb.cfg stop_ndb= initial_ndb= status_ndb= -ndb_discless=0 +ndb_diskless=0 ndb_con_op=100000 ndb_dmem=80M @@ -65,8 +65,8 @@ while test $# -gt 0; do ndb_dmem=40M ndb_imem=12M ;; - --discless) - ndb_discless=1 + --diskless) + ndb_diskless=1 ;; --data-dir=*) fsdir=`echo "$1" | sed -e "s;--data-dir=;;"` @@ -131,7 +131,7 @@ sed \ -e s,"CHOOSE_MaxNoOfConcurrentOperations",$ndb_con_op,g \ -e s,"CHOOSE_DataMemory",$ndb_dmem,g \ -e s,"CHOOSE_IndexMemory",$ndb_imem,g \ - -e s,"CHOOSE_Discless",$ndb_discless,g \ + -e s,"CHOOSE_Diskless",$ndb_diskless,g \ -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \ -e s,"CHOOSE_FILESYSTEM_NODE_1","$fs_name_1",g \ -e s,"CHOOSE_FILESYSTEM_NODE_2","$fs_name_2",g \ diff --git a/ndb/src/common/mgmcommon/ConfigInfo.cpp b/ndb/src/common/mgmcommon/ConfigInfo.cpp index d7cae4356d6..7bf99f2d588 100644 --- a/ndb/src/common/mgmcommon/ConfigInfo.cpp +++ b/ndb/src/common/mgmcommon/ConfigInfo.cpp @@ -177,6 +177,7 @@ const DepricationTransform f_deprication[] = { ,{ "DB", "MemorySpaceTuples", "DataMemory", 0, 8192 } ,{ "DB", "TransactionInactiveTimeBeforeAbort", "TransactionInactiveTimeout", 0, 1 } + ,{ "DB", "Discless", "Diskless", 0, 1 } ,{ "TCP", "ProcessId1", "NodeId1", 0, 1} ,{ "TCP", "ProcessId2", "NodeId2", 0, 1} ,{ "TCP", "SendBufferSize", "SendBufferMemory", 0, 16384 } @@ -930,6 +931,20 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 0, 0, 1}, + + { + CFG_DB_DISCLESS, + "Discless", + "DB", + "Diskless", + ConfigInfo::DEPRICATED, + true, + ConfigInfo::BOOL, + 0, + 0, + 1}, + + { CFG_DB_ARBIT_TIMEOUT, @@ -3098,7 +3113,8 @@ transform(InitConfigFileParser::Context & ctx, require(ctx.m_currentSection->getTypeOf(oldName, &oldType)); ConfigInfo::Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName); if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64) - && (newType == ConfigInfo::INT || newType == ConfigInfo::INT64))){ + && (newType == ConfigInfo::INT || newType == ConfigInfo::INT64 || newType == ConfigInfo::BOOL))){ + ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl; ctx.reportError("Unable to handle type conversion w.r.t deprication %s %s" "- [%s] starting at line: %d", oldName, newName, |