From: magnus.blaudd
Date: May 24 2011 1:09pm
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3343 to 3345)
 Bug#12586131
List-Archive: http://lists.mysql.com/commits/137991
X-Bug: 12586131
Message-Id: <20110524130909.6836B13402B@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3345 magnus.blaudd@stripped	2011-05-24
      ndb
       - disable rpl_ndb_row_implici_commit_binlog due to bug#12586131

    modified:
      mysql-test/suite/rpl_ndb/t/disabled.def
 3344 magnus.blaudd@stripped	2011-05-24
      ndb
       - disable ndb_rpl_dd_advance which hangs on test host

    modified:
      mysql-test/suite/ndb_rpl/t/disabled.def
 3343 magnus.blaudd@stripped	2011-05-24 [merge]
      Merge 7.0 -> 5.5-cluster

    modified:
      storage/ndb/src/mgmsrv/Config.hpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
      storage/ndb/tools/ndb_config.cpp
=== modified file 'mysql-test/suite/ndb_rpl/t/disabled.def'
--- a/mysql-test/suite/ndb_rpl/t/disabled.def	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/disabled.def	2011-05-24 13:05:14 +0000
@@ -18,3 +18,5 @@ ndb_rpl_slave_lsu_anyval : SEAGULL ndb-f
 ndb_rpl_row_implicit_commit_binlog : SEAGULL ndb-force-binlog-format-statement
 
 ndb_rpl_circular_2ch : SEAGULL update test to new rpl scripts
+ndb_rpl_dd_advance : SEAGULL hangs on test hosts
+

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2011-05-24 13:05:58 +0000
@@ -11,5 +11,5 @@
 ##############################################################################
 
 rpl_ndb_set_null       : bug #51100
-
+rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
 

No bundle (reason: useless for push emails).