mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
BUG#25688 (RBR: circular replication may cause STMT_END_F flags to
be skipped): Fixing test since a replace assumed that we were on slave when we were on master. mysql-test/r/rpl_ndb_circular_simplex.result: Result file change mysql-test/t/rpl_ndb_circular_simplex.test: Incorrectly used MASTER_PORT instead of SLAVE_PORT for test. (This is circular replication, you know. The roles of slave and master is kind of blurred. Mea culpa.)
This commit is contained in:
@@ -19,10 +19,10 @@ SHOW SLAVE STATUS;
|
||||
Slave_IO_State #
|
||||
Master_Host 127.0.0.1
|
||||
Master_User root
|
||||
Master_Port 9308
|
||||
Master_Port SLAVE_PORT
|
||||
Connect_Retry 60
|
||||
Master_Log_File slave-bin.000001
|
||||
Read_Master_Log_Pos 468
|
||||
Read_Master_Log_Pos #
|
||||
Relay_Log_File #
|
||||
Relay_Log_Pos #
|
||||
Relay_Master_Log_File slave-bin.000001
|
||||
@@ -49,6 +49,7 @@ Master_SSL_Cert
|
||||
Master_SSL_Cipher
|
||||
Master_SSL_Key
|
||||
Seconds_Behind_Master #
|
||||
Master_SSL_Verify_Server_Cert No
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a b
|
||||
1 2
|
||||
|
||||
@@ -50,8 +50,8 @@ sync_with_master;
|
||||
#SHOW BINLOG EVENTS;
|
||||
|
||||
# Check that there is no error in replication
|
||||
--replace_result $MASTER_MYPORT MASTER_PORT
|
||||
--replace_column 1 # 8 # 9 # 23 # 33 #
|
||||
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
||||
--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
|
||||
query_vertical SHOW SLAVE STATUS;
|
||||
|
||||
# Check that we have the data on the master
|
||||
|
||||
Reference in New Issue
Block a user