Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3

Author: zmur

storage/ndb/test/run-test/autotest-run.sh

@@ -26,7 +26,7 @@
 ##############
 
 save_args=$*
-VERSION="autotest-run.sh version 1.14"
+VERSION="autotest-run.sh version 1.15"
 
 DATE=`date '+%Y-%m-%d'`
 if [ `uname -s` != "SunOS" ]
@@ -85,6 +85,9 @@ do
                 --baseport=*) baseport_arg="$1";;
                 --base-dir=*) base_dir=`echo $1 | sed s/--base-dir=//`;;
                 --clusters=*) clusters_arg="$1";;
+                --atrt-defaults-group-suffix=*)
+                    atrt_defaults_group_suffix_arg="${1/#--atrt-/--}"
+                    ;;
                 --site=*) site_arg="$1";;
         esac
         shift
@@ -361,11 +364,11 @@ if [ ${verbose} -gt 0 ] ; then
 fi
 
 # Setup configuration
-$atrt Cdq ${site_arg} ${clusters_arg} ${verbose_arg} $prefix my.cnf
+$atrt ${atrt_defaults_group_suffix_arg} Cdq ${site_arg} ${clusters_arg} ${verbose_arg} $prefix my.cnf
 
 # Start...
-args=""
-args="--report-file=report.txt"
+args="${atrt_defaults_group_suffix_arg}"
+args="$args --report-file=report.txt"
 args="$args --log-file=log.txt"
 args="$args --testcase-file=$test_dir/$RUN-tests.txt"
 args="$args ${baseport_arg}"

storage/ndb/test/run-test/conf-vigdis05.cnf

@@ -18,13 +18,44 @@ basedir = CHOOSE_dir
 fix-nodeid = 1
 mt = 2
 
+[atrt.2ndbd]
+mt = 0
+
 [ndb_mgmd]
 
 [client]
 protocol=tcp
 
 #
-# .2node
+# .2ndbd - two ndbd nodes
+#
+
+[cluster_config.2ndbd]
+ndb_mgmd = CHOOSE_host1
+ndbd = CHOOSE_host2,CHOOSE_host3
+ndbapi= CHOOSE_host1,CHOOSE_host4,CHOOSE_host5
+
+NoOfReplicas = 2
+DataMemory = 400M
+BackupMemory = 64M
+MaxNoOfConcurrentScans = 100
+MaxNoOfSavedMessages= 5
+SendBufferMemory = 2M
+NoOfFragmentLogFiles = 4
+FragmentLogFileSize = 128M
+CompressedLCP=1
+CompressedBackup=1
+ODirect=1
+MaxNoOfAttributes=2000
+Checksum=1
+
+SharedGlobalMemory=256M
+InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:512M;undofile02.dat:512M
+InitialTablespace=datafile01.dat:128M;datafile02.dat:64M
+TimeBetweenWatchDogCheckInitial=60000
+
+#
+# .2node - two ndbmtd nodes
 #
 
 [cluster_config.2node]