bzr commit into mysql-trunk-bugfixing branch (magnus.blaudd:3398) WL#3127

[Magnus Blåudd]

#At file:///home/msvensson/mysql/trunk-bugfixing/ based on revid:magnus.blaudd@strippedbe9twnj

 3398 Magnus Blåudd	2010-11-26
      WL#3127
       - fix test case timeout on Windows caused by connecting to ipv4 master_host
        with ipv6 master_bind

    modified:
      mysql-test/extra/rpl_tests/rpl_change_master_bind.inc
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_change_master_bind.inc'
--- a/mysql-test/extra/rpl_tests/rpl_change_master_bind.inc	2010-11-25 11:20:16 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_change_master_bind.inc	2010-11-26 14:02:14 +0000
@@ -18,10 +18,20 @@ create table t1(n int, b varchar(256));
 --replace_result $master_bind <master_bind>
 eval insert into t1 values(1, $master_bind);
 
-# Configure slave to connect to master with then give bind address
+# Configure slave to connect to master with the give bind address
+# for master_bind and master_host unless it's an invalid address
 connection slave;
+let $_master_host=;
+if (!$master_bind_error_expected)
+{
+  if ($master_bind != '')
+  {
+    let $_master_host=master_host=$master_bind,;
+  }
+}
+
 --replace_result $master_bind <master_bind>
-eval change master to master_bind=$master_bind;
+eval change master to $_master_host master_bind=$master_bind;
 start slave;
 
 # Check that SHOW SLAVE STATUS has Master_bind column set to $master_bind
@@ -42,7 +52,7 @@ if ($master_bind_error_expected)
   echo got expected error $master_bind_error_expected;
   source include/stop_slave.inc;
 
-  # Reset the master_bind to that cleanup can run
+  # Reset the master_bind so that cleanup can run
   eval change master to master_bind='';
   start slave;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-25 11:20:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-26 14:02:14 +0000
@@ -80,13 +80,13 @@ Eexpected values: "100, 200, 300, 400, 5
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 got expected error 2003
 include/stop_slave.inc
@@ -96,13 +96,13 @@ drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 drop table t1;
 stop slave;

=== 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-11-25 11:20:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2010-11-26 14:02:14 +0000
@@ -80,13 +80,13 @@ Eexpected values: "100, 200, 300, 400, 5
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 got expected error 2003
 include/stop_slave.inc
@@ -96,13 +96,13 @@ drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 drop table t1;
 stop slave;

Attachment: [text/bzr-bundle] bzr/[e-mail]