#At file:///home/horst/bzr/6.0-alik-ipv6-2/ based on revid:horst.hunger@stripped
3733 Horst.Hunger 2009-11-27 [merge]
due to merge
modified:
mysql-test/r/ipv4_as_ipv6_win.result
mysql-test/suite/rpl/r/rpl_ip_mix.result
mysql-test/suite/rpl/r/rpl_ip_mix2.result
mysql-test/suite/rpl/r/rpl_ip_mix2_win.result
mysql-test/suite/rpl/r/rpl_ip_mix_win.result
mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result
mysql-test/suite/rpl/r/rpl_ipv6_win.result
mysql-test/t/ipv4_as_ipv6_win.test
=== modified file 'mysql-test/r/ipv4_as_ipv6_win.result'
--- a/mysql-test/r/ipv4_as_ipv6_win.result 2009-11-27 08:02:32 +0000
+++ b/mysql-test/r/ipv4_as_ipv6_win.result 2009-11-27 12:08:38 +0000
@@ -28,6 +28,6 @@ USER()
root@localhost
DROP USER testuser1@'127.0.0.1';
=============Test of '::1' ========================
-connect (con1, ::1, root, , test, MASTER_MYPORT,);
+connect (con1, ::1, root, , test, MASTER_MYPORT);
Got one of the listed errors
=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix.result 2009-11-26 09:48:34 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix.result 2009-11-27 12:11:57 +0000
@@ -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;
@@ -15,8 +15,8 @@ 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;
@@ -31,8 +31,8 @@ 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;
@@ -47,8 +47,8 @@ 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;
@@ -63,8 +63,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ###########################
-connect (master,0:0:0:0:0:FFFF:127.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:FFFF: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;
@@ -79,8 +79,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ###########################
-connect (master,0000:0000:0000:0000:0000:FFFF:127.0.0.1,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:FFFF: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;
@@ -95,8 +95,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ###########################
-connect (master,0:0000:0000:0:0000:FFFF:127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0:0000:0000:0:0000:FFFF: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;
@@ -111,8 +111,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0::0000:FFFF:127.0.0.1 ###########################
-connect (master,0::0000:FFFF:127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,0::0000:FFFF: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;
@@ -127,8 +127,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: ::FFFF:127.0.0.1 ###########################
-connect (master,::FFFF:127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,::FFFF: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;
=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix2.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix2.result 2009-11-26 08:03:04 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix2.result 2009-11-27 12:08:38 +0000
@@ -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;
@@ -15,8 +15,8 @@ disconnect slave;
disconnect master;
connection default;
#################### 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;
@@ -31,8 +31,8 @@ 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;
@@ -47,8 +47,8 @@ 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;
@@ -63,8 +63,8 @@ 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;
@@ -79,8 +79,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0:0:0:0:0:FFFF:127.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:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -95,8 +95,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0000:0000:0000:0000:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,0000:0000:0000:0000:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -111,8 +111,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0:0000:0000:0:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,0:0000:0000:0:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -127,8 +127,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: 0::0000:FFFF:127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,0::0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,0::0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
@@ -143,8 +143,8 @@ disconnect slave;
disconnect master;
connection default;
#################### IP: ::FFFF:127.0.0.1 ###########################
-connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK);
-connect (slave,::FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK);
+connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
+connect (slave,::FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master;
reset master;
show master status;
=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix2_win.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result 2009-11-27 08:02:32 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix2_win.result 2009-11-27 12:08:38 +0000
@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
+Master-Host: No such row
change master to master_host='::1';
Master-Host: ::1
disconnect slave;
=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix_win.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix_win.result 2009-11-27 08:02:32 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix_win.result 2009-11-27 12:08:38 +0000
@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
+Master-Host: No such row
change master to master_host='::1';
Master-Host: ::1
disconnect slave;
=== modified file 'mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result'
--- a/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result 2009-11-27 08:02:32 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result 2009-11-27 12:08:38 +0000
@@ -29,7 +29,7 @@ Master-Host: ::1
change master to 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;
=== modified file 'mysql-test/suite/rpl/r/rpl_ipv6_win.result'
--- a/mysql-test/suite/rpl/r/rpl_ipv6_win.result 2009-11-27 08:02:32 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ipv6_win.result 2009-11-27 12:08:38 +0000
@@ -23,7 +23,6 @@ File Position Binlog_Do_DB Binlog_Ignore
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-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
disconnect slave;
@@ -39,7 +38,6 @@ File Position Binlog_Do_DB Binlog_Ignore
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-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
disconnect slave;
@@ -55,7 +53,6 @@ File Position Binlog_Do_DB Binlog_Ignore
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave;
reset slave;
-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
disconnect slave;
=== modified file 'mysql-test/t/ipv4_as_ipv6_win.test'
--- a/mysql-test/t/ipv4_as_ipv6_win.test 2009-11-27 08:02:32 +0000
+++ b/mysql-test/t/ipv4_as_ipv6_win.test 2009-11-27 12:08:38 +0000
@@ -20,13 +20,12 @@ let $IPv6= 127.0.0.1;
echo =============Test of '::1' ========================;
let $IPv6= ::1;
---echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,);
+--echo connect (con1, $IPv6, root, , test, MASTER_MYPORT);
--disable_query_log
--error 2003,2006
connect (con1, $IPv6, root, , test, $MASTER_MYPORT);
--enable_query_log
connection default;
-disconnect con1;
# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc
Attachment: [text/bzr-bundle] bzr/horst.hunger@sun.com-20091127121157-fcea22eod1wf7xki.bundle
| Thread |
|---|
| • bzr commit into mysql-6.0-codebase branch (horst.hunger:3733) | Horst.Hunger | 27 Nov |
