Merge romeo.(none):/home/bkroot/mysql-5.1-rpl (7ad588c8) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/rpl_ndb_circular_simplex.result

+36 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 754
		Exec_Master_Log_Pos #
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		@@ -60,3 +60,38 @@ SELECT * FROM t1 ORDER BY a;
		a b
		1 2
		2 3
		SHOW SLAVE STATUS;
		Slave_IO_State #
		Master_Host 127.0.0.1
		Master_User root
		Master_Port 9306
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos #
		Relay_Log_File #
		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_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

+6 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ sync_with_master;

		# Check that there is no error in replication
		--replace_result $SLAVE_MYPORT SLAVE_PORT
		--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
		--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
		query_vertical SHOW SLAVE STATUS;

		# Check that we have the data on the master
		@@ -75,3 +75,8 @@ START SLAVE;
		# check that we have the data on the slave
		sync_with_master;
		SELECT * FROM t1 ORDER BY a;

		# Check that there is no error in replication
		--replace_result $SLAVE_MYPORT SLAVE_PORT
		--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
		query_vertical SHOW SLAVE STATUS;