Improvements to reduce the output for better reading and more stability.

mysql-test/include/rpl_ip_mix.inc

@@ -10,9 +10,11 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/include/rpl_ip_mix2.inc

@@ -10,9 +10,11 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/include/rpl_ipv6.inc

---echo connect (master,$IPv6,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (master,$IPv6,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
---echo connect (slave,$IPv6,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
-connect (slave,$IPv6,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
+--echo connect (master,$IPv6,root,,test,MASTER_MYPORT);
+connect (master,$IPv6,root,,test,$MASTER_MYPORT);
+--echo connect (slave,$IPv6,root,,test,SLAVE_MYPORT);
+connect (slave,$IPv6,root,,test,$SLAVE_MYPORT);
 --echo connection master;
 connection master;
 reset master;
@@ -10,9 +10,9 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/r/ipv4_as_ipv6.result

@@ -176,4 +176,4 @@ DROP USER testuser1@'::FFFF:127.0.0.1';
 =============Test of '::FFFF:127.0.0.1/96' ========================
 =============Test of '::1' ========================
 connect (con1, ::1, root, , test, MASTER_MYPORT,);
-ERROR HY000: Can't connect to MySQL server on '::1' (111)
+Got one of the listed errors

mysql-test/suite/rpl/t/rpl_ip_mix.test

@@ -7,11 +7,10 @@
 # (see corresponding cnf file)
 #
 --source include/check_ipv6.inc
+# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1
+--source include/not_windows.inc
 --source include/have_log_bin.inc
 
-let $IPv6= ::1;
---echo #################### IP: $IPv6 ###########################
---source include/rpl_ip_mix.inc
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
 --source include/rpl_ip_mix.inc
@@ -74,13 +73,17 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='::FFFF:127.0.0.1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='0:0:0:0:0:0:0:1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/suite/rpl/t/rpl_ip_mix2.test

@@ -20,7 +20,9 @@ disconnect checkcon123456789;
 --enable_query_log
 # end check
 
--- source include/have_log_bin.inc
+# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1
+--source include/not_windows.inc
+--source include/have_log_bin.inc
 
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
@@ -87,13 +89,17 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='::FFFF:127.0.0.1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='0:0:0:0:0:0:0:1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.test

@@ -20,7 +20,9 @@ disconnect checkcon123456789;
 --enable_query_log
 # end check
 
--- source include/have_log_bin.inc
+# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1
+--source include/not_windows.inc
+--source include/have_log_bin.inc
 
 let $IPv6= 127.0.0.1;
 --echo #################### IP: $IPv6 ###########################
@@ -68,13 +70,17 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='::FFFF:127.0.0.1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='0:0:0:0:0:0:0:1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/suite/rpl/t/rpl_ipv6.test

@@ -7,11 +7,10 @@
 # for master and slave.
 #
 --source include/check_ipv6.inc
+# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1
+--source include/not_windows.inc
 --source include/have_log_bin.inc
 
-let $IPv6= ::1;
---echo #################### IP: $IPv6 ###########################
---source include/rpl_ipv6.inc
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
 --source include/rpl_ipv6.inc
@@ -74,13 +73,17 @@ save_master_pos;
 --echo connection slave;
 connection slave;
 reset slave;
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='$IPv6';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='::FFFF:127.0.0.1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 eval change master to master_host='0:0:0:0:0:0:0:1';
-source include/show_slave_status2.inc;
+let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
+--echo Master-Host: $master_host
 --echo disconnect slave;
 disconnect slave;
 --echo disconnect master;

mysql-test/t/ipv4_as_ipv6.test

@@ -5,6 +5,8 @@
 # Test of ipv4 (127.0.0.1) in ipv6 format
 # Options: --skip-name-resolve, --bind-address=0.0.0.0 (see corresponding opt file).
 #
+# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1
+--source include/not_windows.inc
 # Can't be tested with embedded server
 --source include/not_embedded.inc
 
@@ -55,7 +57,7 @@ echo =============Test of '::1' ========================;
 let $IPv6= ::1;
 --echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,);
 --disable_query_log
---error 2003
+--error 2003,2006
 connect (con1, $IPv6, root, , test, $MASTER_MYPORT,);
 --enable_query_log
 

mysql-test/t/ipv6.test

@@ -7,6 +7,8 @@
 #
 --source include/check_ipv6.inc
 
+# Can't be tested with windows due to the mixed format like 0:0:0:0:0:FFFF:127.0.0.1
+--source include/not_windows.inc
 # Can't be tested with embedded server
 --source include/not_embedded.inc