bzr push into mysql-5.5-cluster branch (jonas.oreland:3427 to 3429)

[jonas oreland]

 3429 jonas oreland	2011-07-06
      add suppression for running with "--mysqld=--binlog-format=mixed" as pb-swei does

    modified:
      mysql-test/suite/ndb/t/ndb_share.test
 3428 jonas oreland	2011-07-06
      ndb - reenabled tests

    modified:
      mysql-test/suite/ndb_rpl/t/disabled.def
      mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
 3427 jonas oreland	2011-07-06
      ndb 55 - reenable ndb_multi after having MCP:ed bug-44529. Also fix error with missing thd->clear_error()

    modified:
      mysql-test/suite/ndb/t/disabled.def
      sql/ha_ndbcluster_binlog.cc
      sql/ndb_local_connection.cc
      sql/sql_db.cc
=== modified file 'mysql-test/suite/ndb/t/ndb_share.test'
--- a/mysql-test/suite/ndb/t/ndb_share.test	2011-07-06 08:44:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_share.test	2011-07-06 16:48:08 +0000
@@ -2,6 +2,10 @@
 -- source include/have_ndb.inc
 -- source include/have_log_bin.inc
 
+-- disable_query_log
+call mtr.add_suppression('.*You need to use --log-bin to make --binlog-format work.*');
+-- enable_query_log
+
 connect (server1,127.0.0.1,root,,test,$MYSQLD1_PORT,);
 connect (server2,127.0.0.1,root,,test,$MYSQLD2_PORT,);
 connect (server3,127.0.0.1,root,,test,$MYSQLD3_PORT,);

=== modified file 'mysql-test/suite/ndb_rpl/t/disabled.def'
--- a/mysql-test/suite/ndb_rpl/t/disabled.def	2011-05-24 13:05:14 +0000
+++ b/mysql-test/suite/ndb_rpl/t/disabled.def	2011-07-06 15:54:35 +0000
@@ -12,11 +12,7 @@
 
 ndb_rpl_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in 6.2
 
-ndb_rpl_break_3_chain : SEAGULL ndb-force-binlog-format-statement
 ndb_rpl_slave_lsu : SEAGULL ndb-force-binlog-format-statement
 ndb_rpl_slave_lsu_anyval : SEAGULL ndb-force-binlog-format-statement
 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/ndb_rpl/t/ndb_rpl_break_3_chain.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf	2011-06-08 19:28:34 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf	2011-07-06 15:54:35 +0000
@@ -35,6 +35,7 @@ log-bin=                       cluster1-
 # for performance reasons
 ndb-table-temporary=1
 ndb-extra-logging=99
+binlog-format=row
 
 [mysqld.1.cluster1]
 

No bundle (reason: useless for push emails).