From: Luis Soares
Date: January 17 2011 7:00pm
Subject: bzr push into mysql-trunk branch (luis.soares:3521 to 3523) Bug#59499
List-Archive: http://lists.mysql.com/commits/129002
X-Bug: 59499
Message-Id: <201101171900.p0HJ0h35030499@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3523 Luis Soares	2011-01-17 [merge]
      BUG#59499: mtr check fails for some replication tests due to ipv6
      
      Automerge into latest mysql-trunk.

    modified:
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
 3522 Luis Soares	2011-01-17 [merge]
      Automerge from mysql-5.5 into mysql-trunk.

    modified:
      mysql-test/suite/rpl/t/rpl_cross_version.test
 3521 Tor Didriksen	2011-01-17 [merge]
      Merge from 5.5: fix for Bug #58991

    modified:
      cmake/character_sets.cmake
      config.h.cmake
=== modified file 'mysql-test/extra/rpl_tests/rpl_change_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_change_master.test	2010-12-20 14:27:17 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_change_master.test	2011-01-17 18:29:41 +0000
@@ -4,6 +4,9 @@
 
 call mtr.add_suppression("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
 
+connection slave;
+let $save_master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+
 connection master;
 # Make SQL slave thread advance a bit
 create table t1(n int);
@@ -307,3 +310,9 @@ if (!$check_ipv6_supported)
 # Test with no bind address(check that reset works)
 let $master_bind='';
 --source extra/rpl_tests/rpl_change_master_bind.inc
+
+### Revert to original master_host value
+--source include/stop_slave.inc
+--replace_result $save_master_host SAVE_MASTER_HOST
+--eval CHANGE MASTER TO master_host='$save_master_host'
+--source include/start_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-12-19 17:25:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2011-01-17 18:29:41 +0000
@@ -87,4 +87,7 @@ change master to  master_bind=<master_bi
 start slave;
 include/wait_for_slave_to_start.inc
 drop table t1;
+include/stop_slave.inc
+CHANGE MASTER TO master_host='SAVE_MASTER_HOST';
+include/start_slave.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2010-12-19 17:25:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2011-01-17 18:29:41 +0000
@@ -87,4 +87,7 @@ change master to  master_bind=<master_bi
 start slave;
 include/wait_for_slave_to_start.inc
 drop table t1;
+include/stop_slave.inc
+CHANGE MASTER TO master_host='SAVE_MASTER_HOST';
+include/start_slave.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version.test'
--- a/mysql-test/suite/rpl/t/rpl_cross_version.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version.test	2011-01-17 18:51:01 +0000
@@ -12,11 +12,6 @@
 
 --source include/master-slave.inc
 
-# The test is disabled for windows due to 
-# Bug #42879 CHANGE MASTER RELAY_LOG_FILE=path fails on windows
-# Todo: release it from not_windows
---source include/not_windows.inc
-
 #
 # Bug#31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
 #

No bundle (reason: useless for push emails).