diff options
| author | unknown <magnus@neptunus.(none)> | 2004-07-19 10:50:50 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-07-19 10:50:50 +0200 |
| commit | 4baaca9560fb5fd45075be380cdb6897c4830c67 (patch) | |
| tree | c71ba4e1dfd7ec90bdca057d6849b4ad699b6a53 /mysql-test/ndb | |
| parent | 417c3a07c7ad9ea4e04b3d54951b01a03bbe35ee (diff) | |
| download | mariadb-git-4baaca9560fb5fd45075be380cdb6897c4830c67.tar.gz | |
BUG#4511 Made Discless deprecated
mysql-test/mysql-test-run.sh:
Change to diskless
mysql-test/ndb/ndb_config_2_node.ini:
Change to diskless
mysql-test/ndb/ndbcluster.sh:
Change to diskless
ndb/src/common/mgmcommon/ConfigInfo.cpp:
Making Discless deprecated, so it still can be used but a warning will be printed if used.
Adde possibilty to transform a value of type ConfigInfo::BOOL, neede for depicated Discless
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 2 | ||||
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 8 |
2 files changed, 5 insertions, 5 deletions
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 \ |