database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Horst.Hunger
2009-11-26 09:03:04 +01:00
parent 5c8ceee1fb
commit f532170898
14 changed files with 161 additions and 3542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/rpl_ip_mix.inc
View File

@ -10,9 +10,11 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

6
mysql-test/include/rpl_ip_mix2.inc
View File

@ -10,9 +10,11 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

12
mysql-test/include/rpl_ipv6.inc
View File

@ -1,7 +1,7 @@
--echo connect (master,$IPv6,root,,test,MASTER_MYPORT,MASTER_MYSOCK); --echo connect (master,$IPv6,root,,test,MASTER_MYPORT);
connect (master,$IPv6,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (master,$IPv6,root,,test,$MASTER_MYPORT);
--echo connect (slave,$IPv6,root,,test,SLAVE_MYPORT,SLAVE_MYSOCK); --echo connect (slave,$IPv6,root,,test,SLAVE_MYPORT);
connect (slave,$IPv6,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK); connect (slave,$IPv6,root,,test,$SLAVE_MYPORT);
--echo connection master; --echo connection master;
connection master; connection master;
reset master; reset master;
@ -10,9 +10,9 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset slave; reset slave;
source include/show_slave_status2.inc;
eval change master to master_host='$IPv6'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

2
mysql-test/r/ipv4_as_ipv6.result
View File

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

980
mysql-test/suite/rpl/r/rpl_ip_mix.result
View File

File diff suppressed because it is too large Load Diff

968
mysql-test/suite/rpl/r/rpl_ip_mix2.result
View File

File diff suppressed because it is too large Load Diff

650
mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result
View File

@ -1,6 +1,6 @@
#################### 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;
@ -8,55 +8,14 @@ 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;
SHOW SLAVE STATUS;
change master to master_host='127.0.0.1'; change master to master_host='127.0.0.1';
SHOW SLAVE STATUS; Master-Host: 127.0.0.1
Slave_IO_State #
Master_Host 127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; 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,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;
@ -64,95 +23,14 @@ 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;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='0:0:0:0:0:FFFF:127.0.0.1'; change master to master_host='0:0:0:0:0:FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: 0:0:0:0:0:FFFF:127.0.0.1
Slave_IO_State #
Master_Host 0:0:0:0:0:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; 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,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;
@ -160,95 +38,14 @@ 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;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 0:0:0:0:0:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='0000:0000:0000:0000:0000:FFFF:127.0.0.1'; change master to master_host='0000:0000:0000:0000:0000:FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: 0000:0000:0000:0000:0000:FFFF:127.0.0.1
Slave_IO_State #
Master_Host 0000:0000:0000:0000:0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; 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,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;
@ -256,95 +53,14 @@ 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;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 0000:0000:0000:0000:0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='0:0000:0000:0:0000:FFFF:127.0.0.1'; change master to master_host='0:0000:0000:0:0000:FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: 0:0000:0000:0:0000:FFFF:127.0.0.1
Slave_IO_State #
Master_Host 0:0000:0000:0:0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; 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,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;
@ -352,95 +68,14 @@ 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;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 0:0000:0000:0:0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='0::0000:FFFF:127.0.0.1'; change master to master_host='0::0000:FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: 0::0000:FFFF:127.0.0.1
Slave_IO_State #
Master_Host 0::0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; 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,::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;
@ -448,89 +83,8 @@ 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;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 0::0000:FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='::FFFF:127.0.0.1'; change master to master_host='::FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: ::FFFF:127.0.0.1
Slave_IO_State #
Master_Host ::FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; disconnect slave;
disconnect master; disconnect master;
connection default; connection default;
@ -544,173 +98,13 @@ 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;
SHOW SLAVE STATUS; Master-Host: ::FFFF:127.0.0.1
Slave_IO_State #
Master_Host ::FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='::1'; change master to master_host='::1';
SHOW SLAVE STATUS; Master-Host: ::1
Slave_IO_State #
Master_Host ::1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='::FFFF:127.0.0.1'; change master to master_host='::FFFF:127.0.0.1';
SHOW SLAVE STATUS; Master-Host: ::FFFF:127.0.0.1
Slave_IO_State #
Master_Host ::FFFF:127.0.0.1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
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';
SHOW SLAVE STATUS; Master-Host: 0:0:0:0:0:0:0:1
Slave_IO_State #
Master_Host 0:0:0:0:0:0:0:1
Master_User test
Master_Port 3306
Connect_Retry 60
Master_Log_File
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
disconnect slave; disconnect slave;
disconnect master; disconnect master;
connection default; connection default;

1007
mysql-test/suite/rpl/r/rpl_ipv6.result
View File

File diff suppressed because it is too large Load Diff

17
mysql-test/suite/rpl/t/rpl_ip_mix.test
View File

@ -7,11 +7,10 @@
# (see corresponding cnf file) # (see corresponding cnf file)
# #
--source include/check_ipv6.inc --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 --source include/have_log_bin.inc
let $IPv6= ::1;
--echo #################### IP: $IPv6 ###########################
--source include/rpl_ip_mix.inc
let $IPv6= ::1; let $IPv6= ::1;
--echo #################### IP: $IPv6 ########################### --echo #################### IP: $IPv6 ###########################
--source include/rpl_ip_mix.inc --source include/rpl_ip_mix.inc
@ -74,13 +73,17 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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'; 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

16
mysql-test/suite/rpl/t/rpl_ip_mix2.test
View File

@ -20,7 +20,9 @@ disconnect checkcon123456789;
--enable_query_log --enable_query_log
# end check # 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; let $IPv6= ::1;
--echo #################### IP: $IPv6 ########################### --echo #################### IP: $IPv6 ###########################
@ -87,13 +89,17 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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'; 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

16
mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.test
View File

@ -20,7 +20,9 @@ disconnect checkcon123456789;
--enable_query_log --enable_query_log
# end check # 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; let $IPv6= 127.0.0.1;
--echo #################### IP: $IPv6 ########################### --echo #################### IP: $IPv6 ###########################
@ -68,13 +70,17 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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'; 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

17
mysql-test/suite/rpl/t/rpl_ipv6.test
View File

@ -7,11 +7,10 @@
# for master and slave. # for master and slave.
# #
--source include/check_ipv6.inc --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 --source include/have_log_bin.inc
let $IPv6= ::1;
--echo #################### IP: $IPv6 ###########################
--source include/rpl_ipv6.inc
let $IPv6= ::1; let $IPv6= ::1;
--echo #################### IP: $IPv6 ########################### --echo #################### IP: $IPv6 ###########################
--source include/rpl_ipv6.inc --source include/rpl_ipv6.inc
@ -74,13 +73,17 @@ save_master_pos;
--echo connection slave; --echo connection slave;
connection slave; connection slave;
reset 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'; 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'; 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'; 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; --echo disconnect slave;
disconnect slave; disconnect slave;
--echo disconnect master; --echo disconnect master;

4
mysql-test/t/ipv4_as_ipv6.test
View File

@ -5,6 +5,8 @@
# Test of ipv4 (127.0.0.1) in ipv6 format # Test of ipv4 (127.0.0.1) in ipv6 format
# Options: --skip-name-resolve, --bind-address=0.0.0.0 (see corresponding opt file). # 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 # Can't be tested with embedded server
--source include/not_embedded.inc --source include/not_embedded.inc
@ -55,7 +57,7 @@ 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 --error 2003,2006
connect (con1, $IPv6, root, , test, $MASTER_MYPORT,); connect (con1, $IPv6, root, , test, $MASTER_MYPORT,);
--enable_query_log --enable_query_log

2
mysql-test/t/ipv6.test
View File

@ -7,6 +7,8 @@
# #
--source include/check_ipv6.inc --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 # Can't be tested with embedded server
--source include/not_embedded.inc --source include/not_embedded.inc