bzr push into mysql-5.5-cluster-7.2 branch (mauritz.sundell:4142 to 4143)

[Mauritz Sundell]

 4143 Mauritz Sundell	2012-12-14 [merge]
      merge 7.1 -> 7.2

    modified:
      storage/ndb/test/run-test/autotest-boot.sh
      storage/ndb/test/run-test/upgrade-boot.sh
 4142 Frazer Clement	2012-12-10
      Bug #15953730 	NDB : SLAVE_ALLOW_BATCHING BROKEN IN 7.2
      
      Fix in cluster 7.2.  Server code setting thd local variable from 
      global option was only hit once per transaction, rather than once
      per event.
      Therefore it was set on the first row in the transaction, and not 
      thereafter.
      This is a merge error from 7.1->7.2 / 5.1->5.5.
      
      New testcase added in previous commit tests this scenario.

    modified:
      sql/log_event.cc
=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh	2012-12-14 13:58:24 +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).