From: magnus.blaudd
Date: November 15 2011 7:44pm
Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3416 to 3417) WL#5881
List-Archive: http://lists.mysql.com/commits/141958
Message-Id: <201111151944.pAFJiWWQ014952@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3417 magnus.blaudd@stripped	2011-11-15
      WL#5881 - cherrypick fix not to run test for slave_allow_batching with embedded

    modified:
      mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
 3416 magnus.blaudd@stripped	2011-11-15
      ndbcluster
       - cherrypick warning fixes from trunk-cluster

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test'
--- a/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test	2011-02-21 13:17:25 +0000
+++ b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test	2011-11-15 19:43:35 +0000
@@ -22,7 +22,7 @@
 #  server-system-variables.html                                                #
 #                                                                              #
 ################################################################################
-
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 

No bundle (reason: useless for push emails).