After merge fixes (9de027bd) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/rpl_insert_id.result

+4 −1

Original line number	Diff line number	Diff line
		@@ -91,10 +91,10 @@ CREATE TABLE t1 ( a INT UNIQUE );
		SET FOREIGN_KEY_CHECKS=0;
		INSERT INTO t1 VALUES (1),(1);
		ERROR 23000: Duplicate entry '1' for key 1
		drop table t1;
		#
		# Bug#14553: NULL in WHERE resets LAST_INSERT_ID
		#
		drop table t1;
		create table t1(a int auto_increment, key(a));
		create table t2(a int);
		insert into t1 (a) values (null);
		@@ -234,3 +234,6 @@ n b
		2 100
		3 350
		drop table t1;

		# End of 5.0 tests

mysql-test/r/rpl_max_relay_size.result

+32 −29

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@ Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 50477
		Relay_Log_File slave-relay-bin.000014
		Relay_Log_Pos 1221
		Read_Master_Log_Pos 72952
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		@@ -42,8 +42,8 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 50477
		Relay_Log_Space 1221
		Exec_Master_Log_Pos 72952
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -70,9 +70,9 @@ Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 50477
		Relay_Log_File slave-relay-bin.000004
		Relay_Log_Pos 9457
		Read_Master_Log_Pos 72952
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		@@ -85,8 +85,8 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 50477
		Relay_Log_Space 9457
		Exec_Master_Log_Pos 72952
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -113,9 +113,9 @@ Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 50477
		Relay_Log_File slave-relay-bin.000008
		Relay_Log_Pos 1283
		Read_Master_Log_Pos 72952
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		@@ -128,8 +128,8 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 50477
		Relay_Log_Space 1283
		Exec_Master_Log_Pos 72952
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -154,8 +154,8 @@ Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File
		Read_Master_Log_Pos 4
		Relay_Log_File slave-relay-bin.000001
		Relay_Log_Pos 4
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File
		Slave_IO_Running No
		Slave_SQL_Running No
		@@ -169,7 +169,7 @@ Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 0
		Relay_Log_Space 4
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -194,9 +194,9 @@ Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 50535
		Relay_Log_File slave-relay-bin.000009
		Relay_Log_Pos 62
		Read_Master_Log_Pos 73038
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		@@ -209,8 +209,8 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 50535
		Relay_Log_Space 62
		Exec_Master_Log_Pos 73038
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -233,9 +233,9 @@ Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 50583
		Relay_Log_File slave-relay-bin.000010
		Relay_Log_Pos 52
		Read_Master_Log_Pos 73114
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		@@ -248,8 +248,8 @@ Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 50583
		Relay_Log_Space 52
		Exec_Master_Log_Pos 73114
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		@@ -263,6 +263,9 @@ Seconds_Behind_Master #
		flush logs;
		show master status;
		File master-bin.000002
		Position 4
		Position 98
		Binlog_Do_DB
		Binlog_Ignore_DB
		#
		# End of 4.1 tests
		#