bzr push into mysql-trunk branch (nuno.carvalho:3782 to 3783) Bug#11933491

[Nuno Carvalho]

 3783 Nuno Carvalho	2012-05-03
      BUG#11933491: RPL_CHANGE_MASTER_DBUG FAILS ON X86_64 GCOV, TRUNK AFTER FIX FOR BUG 11766112
      
      This test uses 'dummy' as master hostname to mimic a connection failure,
      assuming that 'dummy' is a undefined hostname, although 'dummy' is 
      defined in some *.oracle.com domains what will cause a timeout and not 
      connection retry, the expect error.
      
      Replaced 'dummy' by '300.1.1.1'.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      mysql-test/suite/rpl/t/rpl_change_master_dbug.test
 3782 Gleb Shchepa	2012-05-03
      WL#5855: Print EXPLAIN in JSON format
      
      Minor update to make old Sun C++ compiler happy.

    modified:
      sql/sql_executor.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-04-21 00:00:38 +0000
+++ b/mysql-test/collections/default.experimental	2012-05-03 17:03:03 +0000
@@ -16,7 +16,6 @@ main.kill @freebsd
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2
 
-rpl.rpl_change_master_dbug               # BUG#11933491 2011-06-13 Anitha  Test fails on redhat 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master_dbug.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master_dbug.result	2012-03-23 20:11:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_dbug.result	2012-05-03 17:03:03 +0000
@@ -4,7 +4,7 @@ Note	####	Sending passwords in plain tex
 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]
 include/stop_slave.inc
-CHANGE MASTER TO master_retry_count=3, master_host='dummy', master_connect_retry=1;
+CHANGE MASTER TO master_retry_count=3, master_host='300.1.1.1', master_connect_retry=1;
 START SLAVE io_thread;
 include/wait_for_slave_io_to_stop.inc
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master_dbug.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master_dbug.test	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master_dbug.test	2012-05-03 17:03:03 +0000
@@ -16,7 +16,7 @@
 
 -- connection slave
 -- source include/stop_slave.inc
-CHANGE MASTER TO master_retry_count=3, master_host='dummy', master_connect_retry=1;
+CHANGE MASTER TO master_retry_count=3, master_host='300.1.1.1', master_connect_retry=1;
 START SLAVE io_thread;
 
 # We wait for slave to stop and inspect the number of retries in 

No bundle (reason: useless for push emails).