Skip to content

M
MariaDB
Commit 1579ae04 authored by Andrei Elkin's avatar Andrei Elkin
Browse files
Options

rpl_ndb tests fixing results files due to Master_Info_File of bug#50316

parent 2c966ddd
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 14 deletions
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
View file @ 1579ae04
...@@ -181,6 +181,7 @@ Last_SQL_Errno <Last_SQL_Errno> ...@@ -181,6 +181,7 @@ Last_SQL_Errno <Last_SQL_Errno>
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
set GLOBAL slave_transaction_retries=10; set GLOBAL slave_transaction_retries=10;
include/start_slave.inc include/start_slave.inc
select * from t1 order by nid; select * from t1 order by nid;
......
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
View file @ 1579ae04
...@@ -58,6 +58,7 @@ Last_SQL_Errno 0 ...@@ -58,6 +58,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a b a b
1 2 1 2
...@@ -103,5 +104,6 @@ Last_SQL_Errno 0 ...@@ -103,5 +104,6 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 2 Master_Server_Id 2
Master_Info_File #
STOP SLAVE; STOP SLAVE;
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
View file @ 1579ae04
...@@ -55,6 +55,7 @@ Last_SQL_Errno 0 ...@@ -55,6 +55,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 2 Master_Server_Id 2
Master_Info_File #
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a b a b
1 2 1 2
...@@ -106,4 +107,5 @@ Last_SQL_Errno 0 ...@@ -106,4 +107,5 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
View file @ 1579ae04
...@@ -32,16 +32,55 @@ SELECT * FROM t1 ORDER BY c3; ...@@ -32,16 +32,55 @@ SELECT * FROM t1 ORDER BY c3;
c1 c2 c3 c1 c2 c3
row3 C 3 row3 C 3
row4 D 4 row4 D 4
SHOW SLAVE STATUS; SHOW SLAVE STATUS;;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed 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 Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Slave_IO_State <Slave_IO_State>
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 1 Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos <Read_Master_Log_Pos>
Relay_Log_File <Relay_Log_File>
Relay_Log_Pos <Relay_Log_Pos>
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table <Replicate_Ignore_Table>
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos <Exec_Master_Log_Pos>
Relay_Log_Space <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 <Seconds_Behind_Master>
Master_SSL_Verify_Server_Cert No
Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
STOP SLAVE; STOP SLAVE;
CHANGE MASTER TO CHANGE MASTER TO
master_log_file = 'master-bin.000001', master_log_file = 'master-bin.000001',
master_log_pos = <the_pos> ; master_log_pos = <the_pos> ;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed 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 Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed 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 Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_Info_File
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 1 <Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 1 <Master-Info-File>
START SLAVE; START SLAVE;
SELECT * FROM t1 ORDER BY c3; SELECT * FROM t1 ORDER BY c3;
c1 c2 c3 c1 c2 c3
...@@ -67,7 +106,46 @@ COMMIT; ...@@ -67,7 +106,46 @@ COMMIT;
SELECT * FROM t1; SELECT * FROM t1;
c1 c2 c3 c1 c2 c3
row2 new on slave 2 row2 new on slave 2
SHOW SLAVE STATUS; SHOW SLAVE STATUS;;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed 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 Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Slave_IO_State <Slave_IO_State>
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> <Last_IO_Errno> <Last_IO_Error> 0 1 Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos <Read_Master_Log_Pos>
Relay_Log_File <Relay_Log_File>
Relay_Log_Pos <Relay_Log_Pos>
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table <Replicate_Ignore_Table>
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos <Exec_Master_Log_Pos>
Relay_Log_Space <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 <Seconds_Behind_Master>
Master_SSL_Verify_Server_Cert <Last_IO_Errno>
Last_IO_Errno <Last_IO_Error>
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
View file @ 1579ae04
...@@ -304,6 +304,7 @@ Last_SQL_Errno 0 ...@@ -304,6 +304,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1; DROP TABLE t1;
......
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
View file @ 1579ae04
...@@ -109,6 +109,7 @@ Last_SQL_Errno 0 ...@@ -109,6 +109,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3; SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
hex(c1) hex(c2) c3 hex(c1) hex(c2) c3
1 1 row1 1 1 row1
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
View file @ 1579ae04
...@@ -43,14 +43,14 @@ INSERT INTO t1 VALUES (2,3); ...@@ -43,14 +43,14 @@ INSERT INTO t1 VALUES (2,3);
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
#SELECT * FROM t2 ORDER BY a; #SELECT * FROM t2 ORDER BY a;
# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36 # BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical show slave status; --query_vertical show slave status;
# connect to master and ensure data it there. # connect to master and ensure data it there.
--connection master --connection master
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
#SELECT * FROM t2 ORDER BY a; #SELECT * FROM t2 ORDER BY a;
# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36 # BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical show slave status; --query_vertical show slave status;
# stop replication on "master" as not to replicate # stop replication on "master" as not to replicate
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
View file @ 1579ae04
...@@ -52,7 +52,7 @@ sync_with_master; ...@@ -52,7 +52,7 @@ sync_with_master;
# Check that there is no error in replication # Check that there is no error in replication
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
# Check that we have the data on the master # Check that we have the data on the master
...@@ -79,7 +79,7 @@ SELECT * FROM t1 ORDER BY a; ...@@ -79,7 +79,7 @@ SELECT * FROM t1 ORDER BY a;
# Check that there is no error in replication # Check that there is no error in replication
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
connection master; connection master;
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
View file @ 1579ae04
...@@ -54,7 +54,7 @@ eval CHANGE MASTER TO ...@@ -54,7 +54,7 @@ eval CHANGE MASTER TO
master_log_pos = $the_pos ; master_log_pos = $the_pos ;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> 41 <Master-Info-File>
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
# start the slave again # start the slave again
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
View file @ 1579ae04
...@@ -72,7 +72,7 @@ START SLAVE; ...@@ -72,7 +72,7 @@ START SLAVE;
--sync_slave_with_master --sync_slave_with_master
--connection slave --connection slave
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> 41 <Master-Info-File>
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3; SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
......
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