Skip to content

M
mariadb
Commit 373c18df authored by Horst.Hunger's avatar Horst.Hunger
Browse files
Options

another patch to fix differences.

parent 37771cb7
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 45 deletions
mysql-test/r/ipv4_as_ipv6_win.result
View file @ 373c18df
...@@ -28,6 +28,6 @@ USER() ...@@ -28,6 +28,6 @@ USER()
root@localhost root@localhost
DROP USER testuser1@'127.0.0.1'; DROP USER testuser1@'127.0.0.1';
=============Test of '::1' ======================== =============Test of '::1' ========================
connect (con1, ::1, root, , test, MASTER_MYPORT,); connect (con1, ::1, root, , test, MASTER_MYPORT);
Got one of the listed errors Got one of the listed errors
mysql-test/suite/rpl/r/rpl_ip_mix.result
View file @ 373c18df
#################### IP: ::1 ########################### #################### IP: ::1 ###########################
connect (master,::1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,::1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -15,8 +15,8 @@ disconnect slave; ...@@ -15,8 +15,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ########################### #################### 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 (master,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -31,8 +31,8 @@ disconnect slave; ...@@ -31,8 +31,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0:0:0:0:0:0:1 ########################### #################### 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 (master,0:0:0:0:0:0:0:1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -47,8 +47,8 @@ disconnect slave; ...@@ -47,8 +47,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 127.0.0.1 ########################### #################### IP: 127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -63,8 +63,8 @@ disconnect slave; ...@@ -63,8 +63,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ########################### #################### 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 (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,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -79,8 +79,8 @@ disconnect slave; ...@@ -79,8 +79,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ########################### #################### 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 (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,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -95,8 +95,8 @@ disconnect slave; ...@@ -95,8 +95,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ########################### #################### 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 (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,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -111,8 +111,8 @@ disconnect slave; ...@@ -111,8 +111,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0::0000:FFFF:127.0.0.1 ########################### #################### IP: 0::0000:FFFF:127.0.0.1 ###########################
connect (master,0::0000:FFFF:127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,0::0000:FFFF:127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -127,8 +127,8 @@ disconnect slave; ...@@ -127,8 +127,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: ::FFFF:127.0.0.1 ########################### #################### IP: ::FFFF:127.0.0.1 ###########################
connect (master,::FFFF:127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,::FFFF:127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
......
mysql-test/suite/rpl/r/rpl_ip_mix2.result
View file @ 373c18df
#################### IP: ::1 ########################### #################### IP: ::1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,::1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,::1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -15,8 +15,8 @@ disconnect slave; ...@@ -15,8 +15,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: ::1 ########################### #################### IP: ::1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,::1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,::1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -31,8 +31,8 @@ disconnect slave; ...@@ -31,8 +31,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ########################### #################### IP: 0000:0000:0000:0000:0000:0000:0000:0001 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_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,SLAVE_MYSOCK); connect (slave,0000:0000:0000:0000:0000:0000:0000:0001,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -47,8 +47,8 @@ disconnect slave; ...@@ -47,8 +47,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0:0:0:0:0:0:1 ########################### #################### IP: 0:0:0:0:0:0:0:1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_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,SLAVE_MYSOCK); connect (slave,0:0:0:0:0:0:0:1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -63,8 +63,8 @@ disconnect slave; ...@@ -63,8 +63,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 127.0.0.1 ########################### #################### IP: 127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -79,8 +79,8 @@ disconnect slave; ...@@ -79,8 +79,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ########################### #################### IP: 0:0:0:0:0:FFFF:127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_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,SLAVE_MYSOCK); connect (slave,0:0:0:0:0:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -95,8 +95,8 @@ disconnect slave; ...@@ -95,8 +95,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ########################### #################### IP: 0000:0000:0000:0000:0000:FFFF:127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_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,SLAVE_MYSOCK); connect (slave,0000:0000:0000:0000:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -111,8 +111,8 @@ disconnect slave; ...@@ -111,8 +111,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ########################### #################### IP: 0:0000:0000:0:0000:FFFF:127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_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,SLAVE_MYSOCK); connect (slave,0:0000:0000:0:0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -127,8 +127,8 @@ disconnect slave; ...@@ -127,8 +127,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: 0::0000:FFFF:127.0.0.1 ########################### #################### IP: 0::0000:FFFF:127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,0::0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,0::0000:FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
...@@ -143,8 +143,8 @@ disconnect slave; ...@@ -143,8 +143,8 @@ disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
#################### IP: ::FFFF:127.0.0.1 ########################### #################### IP: ::FFFF:127.0.0.1 ###########################
connect (master,127.0.0.1,root,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (master,127.0.0.1,root,,test,MASTER_MYPORT);
connect (slave,::FFFF:127.0.0.1,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); connect (slave,::FFFF:127.0.0.1,root,,test,SLAVE_MYPORT);
connection master; connection master;
reset master; reset master;
show master status; show master status;
......
mysql-test/suite/rpl/r/rpl_ip_mix2_win.result
View file @ 373c18df
...@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB ...@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave; connection slave;
reset slave; reset slave;
Master-Host: No such row
change master to master_host='::1'; change master to master_host='::1';
Master-Host: ::1 Master-Host: ::1
disconnect slave; disconnect slave;
......
mysql-test/suite/rpl/r/rpl_ip_mix_win.result
View file @ 373c18df
...@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB ...@@ -8,6 +8,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave; connection slave;
reset slave; reset slave;
Master-Host: No such row
change master to master_host='::1'; change master to master_host='::1';
Master-Host: ::1 Master-Host: ::1
disconnect slave; disconnect slave;
......
mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6_win.result
View file @ 373c18df
...@@ -29,7 +29,7 @@ Master-Host: ::1 ...@@ -29,7 +29,7 @@ Master-Host: ::1
change master to master_host='127.0.0.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'; 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 slave;
disconnect master; disconnect master;
connection default; connection default;
mysql-test/suite/rpl/r/rpl_ipv6_win.result
View file @ 373c18df
...@@ -23,7 +23,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB ...@@ -23,7 +23,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave; connection slave;
reset slave; reset slave;
Master-Host: ::1
change master to master_host='0000:0000:0000:0000:0000:0000:0000:0001'; 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 slave;
...@@ -39,7 +38,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB ...@@ -39,7 +38,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave; connection slave;
reset 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'; 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 slave;
...@@ -55,7 +53,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB ...@@ -55,7 +53,6 @@ File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
connection slave; connection slave;
reset slave; reset slave;
Master-Host: 0:0:0:0:0:0:0:1
change master to master_host='127.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 slave;
......
mysql-test/t/ipv4_as_ipv6_win.test
View file @ 373c18df
...@@ -20,13 +20,12 @@ let $IPv6= 127.0.0.1; ...@@ -20,13 +20,12 @@ let $IPv6= 127.0.0.1;
echo =============Test of '::1' ========================; echo =============Test of '::1' ========================;
let $IPv6= ::1; let $IPv6= ::1;
--echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,); --echo connect (con1, $IPv6, root, , test, MASTER_MYPORT);
--disable_query_log --disable_query_log
--error 2003,2006 --error 2003,2006
connect (con1, $IPv6, root, , test, $MASTER_MYPORT); connect (con1, $IPv6, root, , test, $MASTER_MYPORT);
--enable_query_log --enable_query_log
connection default; connection default;
disconnect con1;
# Wait till all disconnects are completed # Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7