From: magnus.blaudd
Date: November 16 2012 3:30pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4095 to 4097)
List-Archive: http://lists.mysql.com/commits/145312
Message-Id: <20121116153019.4039.16349.4097@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4097 magnus.blaudd@stripped	2012-11-16
      rpl_ndb
       - disable rpl_ndb_mixed_implicit_commit
       - add long comment in disabled.def explaining why

    modified:
      mysql-test/suite/rpl_ndb/t/disabled.def
 4096 magnus.blaudd@stripped	2012-11-16
      rpl_ndb
       - remove -slave.opt file without .test file

    removed:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt
 4095 magnus.blaudd@stripped	2012-11-15
      Cherrypick fix for running wihtout --skip-ndb

    removed:
      mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result
      mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result
      mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
      mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/collections/default.release.in
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2012-02-13 21:10:43 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2012-11-16 15:03:35 +0000
@@ -11,5 +11,13 @@
 ##############################################################################
 
 rpl_ndb_set_null       : bug #51100
+# The below two tests runs extra/rpl_tests/rpl_mixed_implicit_commit_binlog
+# which is maintained upstream and easily breaks due to the inherent
+# difference in binlog ouput depending on who's creating the binlog.
+# These tests should be merged and made much more stable by not having
+# to hardcode "magic" numbers into the test. Test should also be fixed
+# to switch binlog_format itself if that is necessary for the test to properly
+# test everything.
+rpl_ndb_mixed_implicit_commit_binlog : unstable, magic numbers causes errors
 rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
 

=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt	2010-08-17 08:56:50 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---default-storage-engine=MyISAM

No bundle (reason: useless for push emails).