Commit d4ede3f5 authored by unknown's avatar unknown
Browse files

rpl_ssl.result, rpl_ssl.test: 

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format


mysql-test/t/rpl_ssl.test:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
mysql-test/r/rpl_ssl.result:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
parent f68891f8

mysql-test/r/rpl_ssl.result

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Master_User replssl 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	424

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -41,7 +41,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	424

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -64,7 +64,7 @@ Master_User replssl 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	12324

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -79,7 +79,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	12324

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File

mysql-test/t/rpl_ssl.test

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ select * from t1; 
# The slave is synced and waiting/reading from master

# SHOW SLAVE STATUS will show "Waiting for master to send event"

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

query_vertical show slave status;



# Stop the slave, as reported in bug#21871 it would hang
@@ -56,5 +56,5 @@ enable_query_log; 
connection master;

sync_slave_with_master;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

query_vertical show slave status;