From: Mauritz Sundell
Date: December 14 2012 2:02pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (mauritz.sundell:4690 to 4691)
List-Archive: http://lists.mysql.com/commits/145508
Message-Id: <20121214140250.23388.1201.4691@msundell-laptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4691 Mauritz Sundell	2012-12-14 [merge]
      merge 7.0 -> 7.1

    modified:
      storage/ndb/test/run-test/autotest-boot.sh
      storage/ndb/test/run-test/upgrade-boot.sh
 4690 Frazer Clement	2012-12-10 [merge]
      Merge 7.0->7.1

    added:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_batch.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_batch.test
      mysql-test/suite/ndb_rpl/t/ndb_slave_exec_info_init.inc
=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh	2011-07-04 16:30:34 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh	2012-12-14 13:57:23 +0000
@@ -240,6 +240,16 @@ fi
 # create the database to be rsynced	 #
 ##########################################
 
+function build_cluster()
+{
+    if grep -qc autotest storage/ndb/compile-cluster 2>/dev/null
+    then
+        storage/ndb/compile-cluster --autotest $*
+    else
+        BUILD/compile-ndb-autotest $*
+    fi
+}
+
 if [ "$build" ]
 then
     rm -rf $install_dir
@@ -255,16 +265,16 @@ then
             cmd /c devenv.com MySql.sln /Build RelWithDebInfo
             cmd /c devenv.com MySql.sln /Project INSTALL /Build
         else
-	    BUILD/compile-ndb-autotest --prefix=$install_dir0
+	    build_cluster --prefix=$install_dir0
 	    make install
         fi
     else
 	cd $dst_place0
-	BUILD/compile-ndb-autotest --prefix=$install_dir0
+	build_cluster --prefix=$install_dir0
 	make install
 	
 	cd $dst_place1
-	BUILD/compile-ndb-autotest --prefix=$install_dir1
+	build_cluster --prefix=$install_dir1
 	make install
     fi
     cd $p

=== modified file 'storage/ndb/test/run-test/upgrade-boot.sh'
--- a/storage/ndb/test/run-test/upgrade-boot.sh	2011-06-30 15:55:35 +0000
+++ b/storage/ndb/test/run-test/upgrade-boot.sh	2012-12-14 13:53:12 +0000
@@ -204,19 +204,30 @@ fi
 # Build the source, make installs, and   #
 # create the database to be rsynced	 #
 ##########################################
+function build_cluster()
+{
+    if [ -x storage/ndb/compile-cluster ]
+    then
+        storage/ndb/compile-cluster --autotest $*
+    else
+        BUILD/compile-ndb-autotest $*
+    fi
+}
+
 install_dir0=$install_dir/$tag0
 install_dir1=$install_dir/$tag1
 if [ "$build" ]
 then
 	cd $dst_place0
         rm -rf $install_dir0
-	BUILD/compile-ndb-autotest --prefix=$install_dir0
+        build_cluster --prefix=$install_dir0
 	make install
 
 	cd $dst_place1
 	rm -rf $install_dir1
-        BUILD/compile-ndb-autotest --prefix=$install_dir1
+        build_cluster --prefix=$install_dir1
 	make install
+        fi
 fi
 
 

No bundle (reason: useless for push emails).