bzr push into mysql-5.5 branch (rohit.kalhans:3666 to 3667)

[Rohit Kalhans]

 3667 Rohit Kalhans	2011-12-26
      rpl.rpl_known_bugs_detection fails on PB2 daily mysql-5.5.
      
      The rpl.rpl_known_bugs_detection fails on pb2 as warnings were found in the
      mysqld log file. We fix this problem by suppressing the warning.

    modified:
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
 3666 Nirbhay Choubey	2011-12-24
      Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTION
                   --FLUSH-LOG BREAKS CONSISTENCY
      
      Post-fix for some failing tests.

    modified:
      client/mysqldump.c
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
=== modified file 'mysql-test/suite/rpl/r/rpl_known_bugs_detection.result'
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2011-09-29 09:17:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2011-12-26 17:10:56 +0000
@@ -1,5 +1,6 @@
 include/master-slave.inc
 [connection master]
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,
 UNIQUE(b));
 INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

=== modified file 'mysql-test/suite/rpl/t/rpl_known_bugs_detection.test'
--- a/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test	2011-09-29 09:17:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test	2011-12-26 17:10:56 +0000
@@ -6,6 +6,8 @@
 source include/have_debug.inc;
 source include/master-slave.inc;
 
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
+
 # Currently only statement-based-specific bugs are here
 -- source include/have_binlog_format_statement.inc
 

No bundle (reason: useless for push emails).