summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/include/rpl_ip_mix.inc8
-rw-r--r--mysql-test/include/rpl_ip_mix2.inc8
-rw-r--r--mysql-test/r/ipv4_as_ipv6_win.result2
-rw-r--r--mysql-test/r/ipv6_win.result18
-rw-r--r--mysql-test/suite/rpl/r/rpl_ip_mix2_win.result38
-rw-r--r--mysql-test/suite/rpl/r/rpl_ip_mix_win.result38
-rw-r--r--mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result14
-rw-r--r--mysql-test/suite/rpl/r/rpl_ipv6_win.result38
-rw-r--r--mysql-test/t/ipv4_as_ipv6_win.test2
9 files changed, 84 insertions, 82 deletions
diff --git a/mysql-test/include/rpl_ip_mix.inc b/mysql-test/include/rpl_ip_mix.inc
index 7ec8237a5ef..96766e7dbdd 100644
--- a/mysql-test/include/rpl_ip_mix.inc
+++ b/mysql-test/include/rpl_ip_mix.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,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
-connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
+--echo connect (master,$IPv6,root,,test,MASTER_MYPORT);
+connect (master,$IPv6,root,,test,$MASTER_MYPORT);
+--echo connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
+connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT);
--echo connection master;
connection master;
reset master;
diff --git a/mysql-test/include/rpl_ip_mix2.inc b/mysql-test/include/rpl_ip_mix2.inc
index 2bbc45049f6..390c788a461 100644
--- a/mysql-test/include/rpl_ip_mix2.inc
+++ b/mysql-test/include/rpl_ip_mix2.inc
@@ -1,7 +1,7 @@
---echo connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (master,127.0.0.1,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,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (master,127.0.0.1,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;
diff --git a/mysql-test/r/ipv4_as_ipv6_win.result b/mysql-test/r/ipv4_as_ipv6_win.result
index 4ef7062055e..4a8a1eef001 100644
--- a/mysql-test/r/ipv4_as_ipv6_win.result
+++ b/mysql-test/r/ipv4_as_ipv6_win.result
@@ -29,3 +29,5 @@ root@localhost
DROP USER testuser1@'127.0.0.1';
=============Test of '::1' ========================
connect (con1, ::1, root, , test, MASTER_MYPORT,);
+Got one of the listed errors
+
diff --git a/mysql-test/r/ipv6_win.result b/mysql-test/r/ipv6_win.result
index 1ff51fcc831..8082e8aa25e 100644
--- a/mysql-test/r/ipv6_win.result
+++ b/mysql-test/r/ipv6_win.result
@@ -15,17 +15,17 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'::1';
RENAME USER testuser@'::1' to testuser1@'::1';
SET PASSWORD FOR testuser1@'::1' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'::1';
=============Test of '::1/128' ====================================
=============Test of '0000:0000:0000:0000:0000:0000:0000:0001' ====
@@ -45,17 +45,17 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'0000:0000:0000:0000:0000:0000:0000:0001';
RENAME USER testuser@'0000:0000:0000:0000:0000:0000:0000:0001' to testuser1@'0000:0000:0000:0000:0000:0000:0000:0001';
SET PASSWORD FOR testuser1@'0000:0000:0000:0000:0000:0000:0000:0001' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'0000:0000:0000:0000:0000:0000:0000:0001';
=============Test of '0:0:0:0:0:0:0:1' ============================
mysqld is alive
@@ -74,15 +74,15 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'0:0:0:0:0:0:0:1';
RENAME USER testuser@'0:0:0:0:0:0:0:1' to testuser1@'0:0:0:0:0:0:0:1';
SET PASSWORD FOR testuser1@'0:0:0:0:0:0:0:1' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'0:0:0:0:0:0:0:1';
diff --git a/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result b/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result
index 115f09d2294..a62186f8ed9 100644
--- a/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result
@@ -1,6 +1,6 @@
#################### IP: ::1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,::1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,::1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -9,13 +9,13 @@ master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
disconnect slave;
disconnect master;
connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -23,15 +23,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='0000:0000:0000:0000:0000:0000:0000:0001';
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0:0:0:0:0:0:1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0:0:0:0:0:0:0:1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,0:0:0:0:0:0:0:1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -39,15 +39,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
#################### IP: 127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -55,9 +55,9 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
disconnect slave;
disconnect master;
connection default;
@@ -71,13 +71,13 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
diff --git a/mysql-test/suite/rpl/r/rpl_ip_mix_win.result b/mysql-test/suite/rpl/r/rpl_ip_mix_win.result
index 12d101fa1d5..e44c2de84ab 100644
--- a/mysql-test/suite/rpl/r/rpl_ip_mix_win.result
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix_win.result
@@ -1,6 +1,6 @@
#################### IP: ::1 ###########################
-connect (master,::1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,::1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -9,13 +9,13 @@ master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
disconnect slave;
disconnect master;
connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ###########################
-connect (master,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -23,15 +23,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='0000:0000:0000:0000:0000:0000:0000:0001';
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0:0:0:0:0:0:1 ###########################
-connect (master,0:0:0:0:0:0:0:1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0:0:0:0:0:0:0:1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -39,15 +39,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
#################### IP: 127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -55,9 +55,9 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
disconnect slave;
disconnect master;
connection default;
@@ -71,13 +71,13 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
diff --git a/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result b/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result
index 2f0fd713f10..448148ce6bb 100644
--- a/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result
+++ b/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result
@@ -1,6 +1,6 @@
#################### IP: 127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -9,7 +9,7 @@ master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
disconnect slave;
disconnect master;
connection default;
@@ -23,13 +23,13 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host 0:0:0:0:0:0:0:1
+Master-Host 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
diff --git a/mysql-test/suite/rpl/r/rpl_ipv6_win.result b/mysql-test/suite/rpl/r/rpl_ipv6_win.result
index a39f7917255..0ffabda7589 100644
--- a/mysql-test/suite/rpl/r/rpl_ipv6_win.result
+++ b/mysql-test/suite/rpl/r/rpl_ipv6_win.result
@@ -1,6 +1,6 @@
#################### IP: ::1 ###########################
-connect (master,::1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,::1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,::1,root,,test,MASTER_MYPORT);
+connect (slave,::1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -9,13 +9,13 @@ master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
disconnect slave;
disconnect master;
connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ###########################
-connect (master,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,MASTER_MYPORT);
+connect (slave,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -23,15 +23,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='0000:0000:0000:0000:0000:0000:0000:0001';
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0:0:0:0:0:0:1 ###########################
-connect (master,0:0:0:0:0:0:0:1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0:0:0:0:0:0:0:1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0:0:0:0:0:0:0:1,root,,test,MASTER_MYPORT);
+connect (slave,0:0:0:0:0:0:0:1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -39,15 +39,15 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0000:0000:0000:0000:0000:0000:0000:0001
+Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
#################### IP: 127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -55,9 +55,9 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
disconnect slave;
disconnect master;
connection default;
@@ -71,13 +71,13 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='::1';
-Master_Host: ::1
+Master-Host: ::1
change master to master_host='127.0.0.1';
-Master_Host: 127.0.0.1
+Master-Host: 127.0.0.1
change master to master_host='0:0:0:0:0:0:0:1';
-Master_Host: 0:0:0:0:0:0:0:1
+Master-Host: 0:0:0:0:0:0:0:1
disconnect slave;
disconnect master;
connection default;
diff --git a/mysql-test/t/ipv4_as_ipv6_win.test b/mysql-test/t/ipv4_as_ipv6_win.test
index f42ba9b37c6..bb76f854b71 100644
--- a/mysql-test/t/ipv4_as_ipv6_win.test
+++ b/mysql-test/t/ipv4_as_ipv6_win.test
@@ -22,7 +22,7 @@ echo =============Test of '::1' ========================;
let $IPv6= ::1;
--echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,);
--disable_query_log
-#--error 2003,2006
+--error 2003,2006
connect (con1, $IPv6, root, , test, $MASTER_MYPORT);
--enable_query_log
connection default;
View Lorry Controller Status