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

Author: Horst.Hunger

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

@@ -1,7 +1,7 @@
---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