bzr push into mysql-trunk branch (manish.4.kumar:5391 to 5392) Bug#13886150

[Manish Kumar]

 5392 Manish Kumar	2013-01-16
      BUG#13886150 - RPL.RPL_INCIDENT FAILS ON PB2 SPORADICALLY DUE TO TIMEOUT
            
      Problem: rpl.rpl_incident fails on pb2 sporadically due to timeout in
               include/wait_for_slave_param.inc. Apart from generic
               linux(linux2.6-x86-64bit, where we have knows timeout issues),
               the failure was observed on gcov-linux-x86_64 and 
               rhel5-x86-32bit. The test is passing in retry attempts in just
               257 milliseconds, it means it might be hanging sometime in 
               include/wait_for_slave_param.inc. This looks like a problem with 
               the test itself.
           
      Fix: Modifying the test a bit by removing the .opt file for this test and
           changing some lines to use the debug sync point in the code.

    removed:
      mysql-test/suite/rpl/t/rpl_incident-master.opt
    modified:
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/t/rpl_incident.test
 5391 Manish Kumar	2013-01-16 [merge]
      WL#6404 - Add rewrite-db option to mysqlbinlog on RBR
      
      Post push fix for the failing tests on windows.

    modified:
      mysql-test/suite/binlog/r/binlog_rewrite_db_noleak.result
      mysql-test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test
      mysql-test/suite/binlog/t/binlog_rewrite_db_noleak.test
      mysql-test/suite/binlog/t/binlog_rewrite_suppress_use.test
=== modified file 'mysql-test/suite/rpl/r/rpl_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_incident.result	revid:manish.4.kumar@stripped
+++ b/mysql-test/suite/rpl/r/rpl_incident.result	revid:manish.4.kumar@stripped
@@ -3,6 +3,7 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
+SET GLOBAL DEBUG="+d,incident_database_resync_on_replace";
 **** On Master ****
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2),(3);
@@ -37,4 +38,5 @@ a
 4
 include/check_slave_is_running.inc
 DROP TABLE t1;
+SET GLOBAL DEBUG= @old_debug;
 include/rpl_end.inc

=== removed file 'mysql-test/suite/rpl/t/rpl_incident-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_incident-master.opt	revid:manish.4.kumar@stripped
+++ b/mysql-test/suite/rpl/t/rpl_incident-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart --loose-debug=+d,incident_database_resync_on_replace

=== modified file 'mysql-test/suite/rpl/t/rpl_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_incident.test	revid:manish.4.kumar@stripped
+++ b/mysql-test/suite/rpl/t/rpl_incident.test	revid:manish.4.kumar@stripped
@@ -1,5 +1,9 @@
 --source include/master-slave.inc
 --source include/have_debug.inc
+--source include/force_restart.inc
+
+--let @old_debug= @@global.debug
+SET GLOBAL DEBUG="+d,incident_database_resync_on_replace";
 
 --echo **** On Master ****
 CREATE TABLE t1 (a INT);
@@ -37,5 +41,7 @@ source include/check_slave_is_running.in
 
 connection master;
 DROP TABLE t1;
+SET GLOBAL DEBUG= @old_debug;
+
 --sync_slave_with_master
 --source include/rpl_end.inc

No bundle (reason: useless for push emails).