summaryrefslogtreecommitdiff
path: root/mysql-test/ndb
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-09-24 16:58:25 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-09-24 16:58:25 +0000
commitc76c38308c4741b5527712da4c2eb37eb987aba0 (patch)
tree4171316b3f027de3e55247678c0813da444bef34 /mysql-test/ndb
parent28aba37b2c9751c6f3e3db9fd7299c75a30caabf (diff)
downloadmariadb-git-c76c38308c4741b5527712da4c2eb37eb987aba0.tar.gz
fix for invalidating table if mismatch with frm
removed debug printout new test in alter table for dictionay update test with multiple connections added coice of setting MaxNoOfOrderedIndexes added option to run "--small-bench" mysql-test/mysql-test-run.sh: added option to run "--small-bench" mysql-test/ndb/ndb_config_2_node.ini: added coice of setting MaxNoOfOrderedIndexes mysql-test/ndb/ndbcluster.sh: added coice of setting MaxNoOfOrderedIndexes mysql-test/r/ndb_alter_table.result: new test in alter table for dictionay update test with multiple connections mysql-test/t/ndb_alter_table.test: new test in alter table for dictionay update test with multiple connections ndb/src/ndbapi/DictCache.cpp: removed debug printout sql/ha_ndbcluster.cc: fix for invalidating table if mismatch with frm
Diffstat (limited to 'mysql-test/ndb')
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini1
-rw-r--r--mysql-test/ndb/ndbcluster.sh5
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index cc0f940efe3..8c89d2aa2cc 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -6,6 +6,7 @@ IndexMemory= CHOOSE_IndexMemory
Diskless= CHOOSE_Diskless
TimeBetweenWatchDogCheck= 30000
DataDir= CHOOSE_FILESYSTEM
+MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
[ndbd]
HostName= CHOOSE_HOSTNAME_1
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index f143242371f..a1b6400d753 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -44,7 +44,8 @@ initial_ndb=
status_ndb=
ndb_diskless=0
-ndb_con_op=100000
+ndb_no_ord=512
+ndb_con_op=10000
ndb_dmem=80M
ndb_imem=24M
@@ -65,6 +66,7 @@ while test $# -gt 0; do
status_ndb=1
;;
--small)
+ ndb_no_ord=128
ndb_con_op=10000
ndb_dmem=40M
ndb_imem=12M
@@ -128,6 +130,7 @@ port_transporter=`expr $ndb_mgmd_port + 2`
if [ $initial_ndb ] ; then
sed \
+ -e s,"CHOOSE_MaxNoOfOrderedIndexes","$ndb_no_ord",g \
-e s,"CHOOSE_MaxNoOfConcurrentOperations","$ndb_con_op",g \
-e s,"CHOOSE_DataMemory","$ndb_dmem",g \
-e s,"CHOOSE_IndexMemory","$ndb_imem",g \