summaryrefslogtreecommitdiff
path: root/mysql-test/ndb
diff options
context:
space:
mode:
authorunknown <jonas@eel.(none)>2006-01-15 20:45:08 +0100
committerunknown <jonas@eel.(none)>2006-01-15 20:45:08 +0100
commitebf577974ed8772ea14b45a524ae158a00172260 (patch)
tree57bfc35b7291e2eb09b19d6d994c07ceb9df0ce3 /mysql-test/ndb
parent1d5a5ae0abb86691df2563df638c7ad93b077af5 (diff)
downloadmariadb-git-ebf577974ed8772ea14b45a524ae158a00172260.tar.gz
ndb dd -
Change default page buffer cache size mysql-test/ndb/ndb_config_1_node.ini: Add configuration of page buffer mysql-test/ndb/ndb_config_2_node.ini: Add configuration of page buffer mysql-test/ndb/ndb_config_4_node.ini: Add configuration of page buffer mysql-test/ndb/ndbcluster.sh: Add configuration of page buffer storage/ndb/include/kernel/ndb_limits.h: Hard code some limits (for now)... storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Add configuration of page buffer storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Add configuration of page buffer storage/ndb/src/kernel/blocks/pgman.cpp: Add configuration of page buffer storage/ndb/src/kernel/blocks/restore.cpp: Add configuration of page buffer storage/ndb/src/mgmsrv/ConfigInfo.cpp: Change default page buffer caches from 1M (only used for testing) to realistic 64M
Diffstat (limited to 'mysql-test/ndb')
-rw-r--r--mysql-test/ndb/ndb_config_1_node.ini1
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini1
-rw-r--r--mysql-test/ndb/ndb_config_4_node.ini1
-rw-r--r--mysql-test/ndb/ndbcluster.sh3
4 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index 53a54161432..b5a765364bb 100644
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index f3c9f42a7ac..e7a12dbde77 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini
index 207b383bb83..89688666a35 100644
--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index 991c5a5291d..bc5d1000fe5 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -58,6 +58,7 @@ ndb_no_attr=2048
ndb_con_op=105000
ndb_dmem=80M
ndb_imem=24M
+ndb_pbmem=32M
VERBOSE=100
NDB_MGM_EXTRA_OPTS=
@@ -90,6 +91,7 @@ while test $# -gt 0; do
ndb_con_op=5000
ndb_dmem=10M
ndb_imem=1M
+ ndb_pbmem=4M
;;
--diskless)
ndb_diskless=1
@@ -206,6 +208,7 @@ if [ $initial_ndb ] ; then
-e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
-e s,"CHOOSE_FILESYSTEM","$fs_ndb",g \
-e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \
+ -e s,"CHOOSE_DiskPageBufferMemory","$ndb_pbmem",g \
< "$config_ini" \
> "$fs_ndb/config.ini"
fi