5 files changed, 35 insertions, 10 deletions
diff --git a/mysql-test/ndb/Makefile.am b/mysql-test/ndb/Makefile.am
index 178e40fb19a..4ddf61cf5cc 100644
--- a/mysql-test/ndb/Makefile.am
+++ b/mysql-test/ndb/Makefile.am
@@ -2,12 +2,11 @@
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test/ndb
 
+EXTRA_DIST = ndbcluster.sh
+CLEANFILES = ndbcluster
+dist_test_DATA = ndb_config_2_node.ini ndb_config_1_node.ini
 test_SCRIPTS = ndbcluster
 
-noinst_HEADERS = ndbcluster.sh
-
-dist_test_DATA = ndb_config_2_node.ini
-
 SUFFIXES = .sh
 
 .sh:
diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index 7b0d2829530..39e758493c8 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
 
 #
 # Increase deadlock-timeout to cater for slow test-machines
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index aafed28dbc6..99f31150d8c 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -11,6 +11,10 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
 MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
 TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
+# the following parametes just function as a small regression
+# test that the parameter exists
+InitialNoOfOpenFiles= 27
 
 #
 # Increase deadlock-timeout to cater for slow test-machines
@@ -36,3 +40,11 @@ PortNumber= CHOOSE_PORT_MGM
 [mysqld]
 
 [mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini
index 2154475aa37..94d58bd8efc 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
 
 #
 # Increase deadlock-timeout to cater for slow test-machines
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index be08781361e..1e25cd8047e 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -30,12 +30,13 @@ cd $CWD
 # Are we using a source or a binary distribution?
 if [ -d ../sql ] ; then
    SOURCE_DIST=1
-   ndbtop=$BASEDIR/ndb
+   ndbtop=$BASEDIR/storage/ndb
    exec_ndb=$ndbtop/src/kernel/ndbd
    exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd
    exec_waiter=$ndbtop/tools/ndb_waiter
    exec_test=$ndbtop/tools/ndb_test_platform
-   exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm
+   exec_test_ndberror=
+   exec_test_ndberror=$ndbtop/src/ndbapi/ndberror_check
 else
    BINARY_DIST=1
    if test -x "$BASEDIR/libexec/ndbd"
@@ -48,6 +49,7 @@ else
    fi
    exec_waiter=$BASEDIR/bin/ndb_waiter
    exec_test=$BASEDIR/bin/ndb_test_platform
+   exec_test_ndberror=
    exec_mgmtclient=$BASEDIR/bin/ndb_mgm
 fi
 
@@ -56,6 +58,13 @@ if $exec_test ; then :; else
   exit 1
 fi
 
+if [ $exec_test_ndberror ] ; then
+if $exec_test_ndberror ; then :; else
+  echo "please fix in ndberror.c"
+  exit 1
+fi
+fi
+
 pidfile=ndbcluster.pid
 cfgfile=Ndb.cfg
 test_ndb=
@@ -72,6 +81,7 @@ ndb_no_attr=2048
 ndb_con_op=105000
 ndb_dmem=80M
 ndb_imem=24M
+ndb_pbmem=32M
 
 VERBOSE=100
 NDB_MGM_EXTRA_OPTS=
@@ -101,10 +111,11 @@ while test $# -gt 0; do
      status_ndb=1
      ;;
     --small)
-     ndb_no_ord=128
-     ndb_con_op=10000
-     ndb_dmem=40M
-     ndb_imem=12M
+     ndb_no_ord=32
+     ndb_con_op=5000
+     ndb_dmem=20M
+     ndb_imem=1M
+     ndb_pbmem=4M
      ;;
     --diskless)
      ndb_diskless=1
@@ -235,6 +246,7 @@ if [ $initial_ndb ] ; then
     -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
     -e s,"CHOOSE_FILESYSTEM","$config_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