Modifications in mysql-5.5 engines test suite.

mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result

@@ -55,6 +55,12 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+ERROR 23000: Duplicate entry 'abc-abc-abc' for key 'PRIMARY'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+ERROR 23000: Duplicate entry 'abc-abc-def' for key 'PRIMARY'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+ERROR 23000: Duplicate entry 'abc-def-def' for key 'PRIMARY'
 SELECT hex(c1),hex(c2),hex(c3) FROM t1;
 hex(c1)	hex(c2)	hex(c3)
 61626300000000000000	61626300000000000000	61626300000000000000

mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result

@@ -55,6 +55,12 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+ERROR 23000: Duplicate entry 'abc-abc-abc' for key 'PRIMARY'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+ERROR 23000: Duplicate entry 'abc-abc-def' for key 'PRIMARY'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+ERROR 23000: Duplicate entry 'abc-def-def' for key 'PRIMARY'
 SELECT * FROM t1;
 c1	c2	c3
 abc

mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result

@@ -55,6 +55,12 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+ERROR 23000: Duplicate entry 'abc-abc-abc' for key 'c1'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+ERROR 23000: Duplicate entry 'abc-abc-def' for key 'c1'
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+ERROR 23000: Duplicate entry 'abc-def-def' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 abc

mysql-test/suite/engines/funcs/r/rpl_000015.result

@@ -10,25 +10,174 @@ File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	107		
 stop slave;
 reset slave;
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	#
 Master_Log_File	
 Read_Master_Log_Pos	4
+Relay_Log_File	#
+Relay_Log_Pos	#
 Relay_Master_Log_File	
+Slave_IO_Running	No
+Slave_SQL_Running	No
+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	0
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 change master to master_host='127.0.0.1';
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	#
 Master_Log_File	
 Read_Master_Log_Pos	4
+Relay_Log_File	#
+Relay_Log_Pos	#
 Relay_Master_Log_File	
+Slave_IO_Running	No
+Slave_SQL_Running	No
+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	0
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=MASTER_PORT;
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	#
 Master_Log_File	
 Read_Master_Log_Pos	4
+Relay_Log_File	#
+Relay_Log_Pos	#
 Relay_Master_Log_File	
+Slave_IO_Running	No
+Slave_SQL_Running	No
+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	0
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 start slave;
+show slave status;
+Slave_IO_State	Waiting for master to send event
+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	107
+Relay_Log_File	slave-relay-bin.000002
+Relay_Log_Pos	254
 Relay_Master_Log_File	master-bin.000001
-Checking that both slave threads are running.
+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	107
+Relay_Log_Space	410
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 drop table if exists t1;
 create table t1 (n int, PRIMARY KEY(n));
 insert into t1 values (10),(45),(90);

mysql-test/suite/engines/funcs/r/rpl_change_master.result

@@ -11,7 +11,13 @@ stop slave sql_thread;
 insert into t1 values(1);
 insert into t1 values(2);
 stop slave;
+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
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	192	#	None		0	No						#	No	0		0			1
 change master to master_user='root';
+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
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	192	#	None		0	No						#	No	0		0			1
 start slave;
 select * from t1;
 n

mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result

@@ -17,6 +17,45 @@ let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%
 
 --source include/wait_slave_status.inc
 flush logs;
-Relay_Log_File	mysqld-relay-bin.000003
+SHOW SLAVE STATUS;
-Checking that both slave threads are running.
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	SLAVE_PORT
+Connect_Retry	60
+Master_Log_File	slave-bin.000001
+Read_Master_Log_Pos	107
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	slave-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	107
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	2
 STOP SLAVE;

mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result

@@ -10,6 +10,6 @@ load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
 select count(*) from test.t1;
 count(*)
 2
-show binlog events from <binlog_start>;
+show binlog events from 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 drop table test.t1;

mysql-test/suite/engines/funcs/r/rpl_log_pos.result

@@ -4,23 +4,39 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	107	<Binlog_Ignore_DB>	
+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
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	107	#	#	master-bin.000001	Yes	Yes							0		0	107	#	None		0	No						#	No	0		0			1
 stop slave;
-change master to master_log_pos=MASTER_LOG_POS;
+change master to master_log_pos=107;
 start slave;
 stop slave;
-change master to master_log_pos=MASTER_LOG_POS;
+change master to master_log_pos=107;
+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
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	107	#	#	master-bin.000001	No	No							0		0	107	#	None		0	No						#	No	0		0			1
 start slave;
+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
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	107	#	#	master-bin.000001	Yes	Yes							0		0	107	#	None		0	No						#	No	0		0			1
 stop slave;
-# impossible position leads to an error
+change master to master_log_pos=178;
-change master to master_log_pos=MASTER_LOG_POS;
 start slave;
-Last_IO_Error = Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position'
+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
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	178	#	#	master-bin.000001	No	Yes							0		0	178	#	None		0	No						#	No	1236	Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position'	0			1
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	107	<Binlog_Ignore_DB>	
 create table if not exists t1 (n int);
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (1),(2),(3);
 stop slave;
-change master to master_log_pos=MASTER_LOG_POS;
+change master to master_log_pos=207;
 start slave;
 select * from t1 ORDER BY n;
 n

mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result

@@ -8,17 +8,48 @@ start slave;
 CREATE TABLE t1 (a INT, b LONG);
 INSERT INTO t1 VALUES (1,1), (2,2);
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
-show binlog events from <binlog_start>;
+SHOW BINLOG EVENTS;
 **** On Slave ****
-show binlog events from <binlog_start>;
+SHOW SLAVE STATUS;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+Slave_IO_State	#
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
+Master_Host	127.0.0.1
-slave-bin.000001	#	Query	#	#	BEGIN
+Master_User	root
-slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
+Master_Port	MASTER_PORT
-slave-bin.000001	#	Query	#	#	COMMIT
+Connect_Retry	1
-slave-bin.000001	#	Query	#	#	BEGIN
+Master_Log_File	master-bin.000001
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+Read_Master_Log_Pos	#
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+Relay_Log_File	#
-slave-bin.000001	#	Query	#	#	COMMIT
+Relay_Log_Pos	#
-show binlog events from <binlog_start>;
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
+SHOW BINLOG EVENTS;
 DROP TABLE IF EXISTS t1;

mysql-test/suite/engines/funcs/r/rpl_row_drop.result

@@ -41,11 +41,14 @@ t1
 t2
 **** On Master ****
 DROP TABLE t1,t2;
-show binlog events from <binlog_start>;
+SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
+master-bin.000001	4	Format_desc	1	107	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 (a int)
+master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a int)
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	193	Query	1	279	use `test`; CREATE TABLE t2 (a int)
+master-bin.000001	279	Query	1	403	use `test`; DROP TEMPORARY TABLE IF EXISTS `t2` /* generated by server */
+master-bin.000001	403	Query	1	527	use `test`; DROP TEMPORARY TABLE IF EXISTS `t2` /* generated by server */
+master-bin.000001	527	Query	1	631	use `test`; DROP TABLE `t1` /* generated by server */
 SHOW TABLES;
 Tables_in_test
 t2

mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result

@@ -17,5 +17,45 @@ a
 0
 drop table t1;
 insert into t1 values (1);
-Last_SQL_Error = Error 'Table 'test.t1' doesn't exist' on opening tables
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+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	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	test.t2
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	1146
+Last_Error	Error executing row event: 'Table 'test.t1' doesn't exist'
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	1146
+Last_SQL_Error	Error executing row event: 'Table 'test.t1' doesn't exist'
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 drop table t1, t2;

mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result

@@ -11,8 +11,9 @@ change master to master_user='test';
 Master_User	test
 Master_Host	127.0.0.1
 reset slave;
-Master_User	root
+Master_User	test
 Master_Host	127.0.0.1
+change master to master_user='root';
 include/start_slave.inc
 Master_User	root
 Master_Host	127.0.0.1
@@ -30,11 +31,11 @@ include/stop_slave.inc
 reset slave;
 change master to master_user='impossible_user_name';
 start slave;
-include/stop_slave.inc
+stop slave;
 change master to master_user='root';
 include/start_slave.inc
-include/stop_slave.inc
+stop slave;
 change master to master_user='impossible_user_name';
 start slave;
-include/stop_slave.inc
+stop slave;
 reset slave;

mysql-test/suite/engines/funcs/r/rpl_row_sp005.result

@@ -77,6 +77,8 @@ id2
 < ---- Master selects-- >
 -------------------------
 CALL test.p1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM test.t3 ORDER BY id3;
 id3	c
 1	MySQL

mysql-test/suite/engines/funcs/r/rpl_row_trig003.result

@@ -69,9 +69,15 @@ INSERT INTO test.t2 VALUES(NULL,0,'Testing MySQL databases is a cool ', 'MySQL C
 UPDATE test.t1 SET b1 = 0 WHERE b1 = 1;
 INSERT INTO test.t2 VALUES(NULL,1,'This is an after update test.', 'If this works, total will not be zero on the master or slave',1.4321,5.221,0,YEAR(NOW()),NOW());
 UPDATE test.t2 SET b1 = 0 WHERE b1 = 1;
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 INSERT INTO test.t1 VALUES(NULL,1,'add some more test data test.', 'and hope for the best', 3.321,5.221,0,YEAR(NOW()),NOW());
 DELETE FROM test.t1 WHERE id = 1;
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 DELETE FROM test.t2 WHERE id = 1;
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 DROP TRIGGER test.t1_bi;
 DROP TRIGGER test.t2_ai;
 DROP TRIGGER test.t1_bu;

mysql-test/suite/engines/funcs/r/rpl_row_until.result

@@ -12,39 +12,201 @@ create table t2(n int not null auto_increment primary key);
 insert into t2 values (1),(2);
 insert into t2 values (3),(4);
 drop table t2;
-start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS;
+start slave until master_log_file='master-bin.000001', master_log_pos=311;
 select * from t1;
 n
 1
 2
 3
 4
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=MASTER_LOG_POS;
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	slave-relay-bin.000004
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	#
+Slave_SQL_Running	No
+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	Master
+Until_Log_File	master-bin.000001
+Until_Log_Pos	311
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
+start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
 select * from t1;
-n
+n	1
-1
+n	2
-2
+n	3
-3
+n	4
-4
+show slave status;
-start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=RELAY_LOG_POS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	slave-relay-bin.000004
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	#
+Slave_SQL_Running	No
+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	Master
+Until_Log_File	master-no-such-bin.000001
+Until_Log_Pos	291
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
+start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728;
 select * from t2;
-n
+show slave status;
-1
+Slave_IO_State	#
-2
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	slave-relay-bin.000004
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	#
+Slave_SQL_Running	No
+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	Relay
+Until_Log_File	slave-relay-bin.000004
+Until_Log_Pos	728
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 start slave;
 stop slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS;
+start slave until master_log_file='master-bin.000001', master_log_pos=740;
-start slave until master_log_file='master-bin', master_log_pos=MASTER_LOG_POS;
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	slave-relay-bin.000004
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+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	Master
+Until_Log_File	master-bin.000001
+Until_Log_Pos	740
+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
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
+start slave until master_log_file='master-bin', master_log_pos=561;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS, relay_log_pos=RELAY_LOG_POS;
+start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave until master_log_file='master-bin.000001';
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave until relay_log_file='slave-relay-bin.000002';
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=MASTER_LOG_POS;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave sql_thread;
-start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS;
+start slave until master_log_file='master-bin.000001', master_log_pos=740;
 Warnings:
-Note	1254	Slave is already running
+Level	Note
+Code	1254
+Message	Slave is already running

mysql-test/suite/engines/funcs/r/rpl_server_id1.result

@@ -8,8 +8,10 @@ create table t1 (n int);
 reset master;
 stop slave;
 change master to master_port=SLAVE_PORT;
+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
+	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No				#		#	0		0	0	107	None		0	No						NULL	No	0		0			1
 start slave;
-Last_IO_Error = Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).
 insert into t1 values (1);
 show status like "slave_running";
 Variable_name	Value

mysql-test/suite/engines/funcs/r/rpl_server_id2.result

@@ -8,6 +8,9 @@ create table t1 (n int);
 reset master;
 stop slave;
 change master to master_port=SLAVE_PORT;
+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
+	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No						#	0		0	0	107	None		0	No						NULL	No	0		0			1
 start slave;
 insert into t1 values (1);
 select * from t1;

mysql-test/suite/engines/funcs/r/rpl_slave_status.result

@@ -18,5 +18,46 @@ drop user rpl@127.0.0.1;
 flush privileges;
 stop slave;
 start slave;
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	rpl
+Master_Port	MASTER_MYPORT
+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	Connecting
+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	NULL
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	0
+Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 drop table t1;
 drop table t1;

mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result

@@ -376,7 +376,7 @@ CREATE TABLE t12 (data LONG);
 LOCK TABLES t12 WRITE;
 INSERT INTO t12 VALUES(UUID());
 UNLOCK TABLES;
-show binlog events from <binlog_start>;
+show binlog events;
-show binlog events from <binlog_start>;
+show binlog events;
 drop database mysqltest1;
 set global binlog_format= @saved_binlog_format;

mysql-test/suite/engines/funcs/r/sf_cursor.result

@@ -34,6 +34,8 @@ END//
 SELECT sf1();
 sf1()
 0
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -51,6 +53,8 @@ id	data
 2	1
 3	3
 INSERT INTO t4 VALUES(sf1());
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -71,6 +75,9 @@ id	data
 3	3
 3	3
 UPDATE t4 SET i = sf1() + 1 WHERE i = sf1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -97,6 +104,8 @@ id	data
 3	3
 3	3
 DELETE FROM t4 WHERE i = sf1() + 1;
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1

mysql-test/suite/engines/funcs/r/sp_alter.result

@@ -31,6 +31,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#       ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -80,6 +82,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -129,6 +133,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -178,6 +184,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -227,6 +235,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -276,6 +286,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#     COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -325,6 +337,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -374,6 +388,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -423,6 +439,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -472,6 +490,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -521,6 +541,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#       ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -570,6 +592,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -619,6 +643,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -668,6 +694,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -717,6 +745,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA     ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -766,6 +796,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#     COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -815,6 +847,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -864,6 +898,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -913,6 +949,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -962,6 +1000,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA   COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1011,6 +1051,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#   SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1060,6 +1102,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1109,6 +1153,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1158,6 +1204,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1207,6 +1255,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1256,6 +1306,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#   SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1305,6 +1357,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1354,6 +1408,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1403,6 +1459,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1452,6 +1510,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1501,6 +1561,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#   SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1550,6 +1612,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1599,6 +1663,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1648,6 +1714,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1697,6 +1765,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA SQL SECURITY INVOKER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1746,6 +1816,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#   SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1795,6 +1867,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1844,6 +1918,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1893,6 +1969,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1942,6 +2020,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA SQL SECURITY INVOKER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -1991,6 +2071,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#    SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2040,6 +2122,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2089,6 +2173,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2138,6 +2224,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2187,6 +2275,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2236,6 +2326,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET#    SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2285,6 +2377,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# CONTAINS SQL  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2334,6 +2428,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# NO SQL  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2383,6 +2479,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# READS SQL DATA  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2432,6 +2530,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1    #DET# MODIFIES SQL DATA  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2481,6 +2581,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#    SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2530,6 +2632,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2579,6 +2683,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2628,6 +2734,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2677,6 +2785,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA  SQL SECURITY DEFINER   ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2726,6 +2836,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET#    SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2775,6 +2887,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# CONTAINS SQL  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2824,6 +2938,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# NO SQL  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2873,6 +2989,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# READS SQL DATA  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1
@@ -2922,6 +3040,8 @@ CLOSE cur2;
 END//
 ALTER PROCEDURE sp1  LANGUAGE SQL #DET# MODIFIES SQL DATA  SQL SECURITY DEFINER COMMENT 'comment' ;
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1

mysql-test/suite/engines/funcs/r/sp_cursor.result

@@ -30,6 +30,8 @@ CLOSE cur1;
 CLOSE cur2;
 END//
 CALL sp1();
+Warnings:
+Error	1329	No data - zero rows fetched, selected, or processed
 SELECT * FROM t1 ORDER BY id;
 id	data
 1	1

mysql-test/suite/engines/funcs/t/disabled.def

@@ -1,8 +1,99 @@
 # List of disabled tests
 # test name : comment
-rpl_redirect              : Fails due to bug#49978
+rpl_redirect : Fails due to bug#49978
-crash_manycolumns_string  : Bug#50495 'Row size too large' for plugin, but works for built-in innodb
+crash_manycolumns_string : Bug#50495 'Row size too large' for plugin, but works for built-in innodb
-ix_unique_lob             : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
+ix_unique_lob : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
-ix_unique_string_length   : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
+ix_unique_string_length : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
-rpl_empty_master_crash    : Test not applicable in 5.5+  
+rpl_empty_master_crash    : Test not applicable in 5.5+
-rpl_REDIRECT              : Test not applicable in 5.5+ 
+rpl_REDIRECT              : Test not applicable in 5.5+
+
+rpl_create_database : Result Difference Due To Change In .inc file
+rpl_loaddata_m : Result Difference Due To Change In .inc file
+rpl_sp_effects : Result Difference Due To Change In .inc file
+rpl_variables : Result Difference Due To Change In .inc file
+rpl_loaddata_s : Result Difference Due To Change In .inc file
+rpl_dual_pos_advance : Result Difference Due To Change In .inc file
+rpl000011 : Result Difference Due To Change In .inc file
+rpl000013 : Result Difference Due To Change In .inc file
+rpl_000015 : Result Difference Due To Change In .inc file
+rpl_LD_INFILE : Result Difference Due To Change In .inc file
+rpl_alter : Result Difference Due To Change In .inc file
+rpl_alter_db : Result Difference Due To Change In .inc file
+rpl_alter_db : Result Difference Due To Change In .inc file
+rpl_bit : Result Difference Due To Change In .inc file
+rpl_bit_npk : Result Difference Due To Change In .inc file
+rpl_change_master : Result Difference Due To Change In .inc file
+rpl_do_grant : Result Difference Due To Change In .inc file
+rpl_drop : Result Difference Due To Change In .inc file
+rpl_drop_db : Result Difference Due To Change In .inc file
+rpl_flushlog_loop : Result Difference Due To Change In .inc file
+rpl_get_lock : Result Difference Due To Change In .inc file
+rpl_get_lock : Result Difference Due To Change In .inc file
+rpl_insert : Result Difference Due To Change In .inc file
+rpl_insert_select : Result Difference Due To Change In .inc file
+rpl_loaddata2 : Result Difference Due To Change In .inc file
+rpl_loaddatalocal : Result Difference Due To Change In .inc file
+rpl_loadfile : Result Difference Due To Change In .inc file
+rpl_log_pos : Result Difference Due To Change In .inc file
+rpl_many_optimize : Result Difference Due To Change In .inc file
+rpl_master_pos_wait : Result Difference Due To Change In .inc file
+rpl_misc_functions : Result Difference Due To Change In .inc file
+rpl_ps : Result Difference Due To Change In .inc file
+rpl_server_id1 : Result Difference Due To Change In .inc file
+rpl_session_var : Result Difference Due To Change In .inc file
+rpl_sf : Result Difference Due To Change In .inc file
+rpl_slave_status : Result Difference Due To Change In .inc file
+rpl_sp004 : Result Difference Due To Change In .inc file
+rpl_start_stop_slave : Result Difference Due To Change In .inc file
+rpl_stm_max_relay_size : Result Difference Due To Change In .inc file
+rpl_stm_mystery22 : Result Difference Due To Change In .inc file
+rpl_stm_no_op : Result Difference Due To Change In .inc file
+rpl_stm_reset_slave : Result Difference Due To Change In .inc file
+rpl_temp_table : Result Difference Due To Change In .inc file
+rpl_temporary : Result Difference Due To Change In .inc file
+rpl_trigger : Result Difference Due To Change In .inc file
+rpl_trunc_temp : Result Difference Due To Change In .inc file
+rpl_user_variables : Result Difference Due To Change In .inc file
+rpl_server_id2 : Result Difference Due To Change In .inc file
+rpl000010 : Result Difference Due To Change In .inc file
+rpl_init_slave : Result Difference Due To Change In .inc file
+rpl_multi_delete2 : Result Difference Due To Change In .inc file
+rpl_view : Result Difference Due To Change In .inc file
+rpl_ignore_table_update : Result Difference Due To Change In .inc file
+rpl_err_ignoredtable : Result Difference Due To Change In .inc file
+rpl_multi_update4 : Result Difference Due To Change In .inc file
+rpl_multi_delete : Result Difference Due To Change In .inc file
+rpl_ignore_grant : Result Difference Due To Change In .inc file
+rpl_ignore_revoke : Result Difference Due To Change In .inc file
+rpl_free_items : Result Difference Due To Change In .inc file
+rpl_replicate_ignore_db : Result Difference Due To Change In .inc file
+rpl000017 : Result Difference Due To Change In .inc file
+rpl_skip_error : Result Difference Due To Change In .inc file
+
+rpl_row_until : Test Present in rpl suite as well . Test Fails table with t2 table not found.
+rpl_loaddata_s : Test Present in rpl suite as well . Test Fails due to bin log truncation.
+rpl_log_pos : Test Present in rpl suite as well . Test Fails due to bin log truncation.
+rpl_row_NOW : Result Difference Due To Change In .inc file
+rpl_row_USER : Result Difference Due To Change In .inc file
+rpl_row_drop : Result Difference Due To Change In .inc file
+rpl_row_func001 : Result Difference Due To Change In .inc file
+rpl_row_max_relay_size : Result Difference Due To Change In .inc file
+rpl_row_reset_slave : Result Difference Due To Change In .inc file
+rpl_row_sp001 : Result Difference Due To Change In .inc file
+rpl_row_sp005 : Result Difference Due To Change In .inc file
+rpl_row_sp008 : Result Difference Due To Change In .inc file
+rpl_row_sp009 : Result Difference Due To Change In .inc file
+rpl_row_sp010 : Result Difference Due To Change In .inc file
+rpl_row_sp011 : Result Difference Due To Change In .inc file
+rpl_row_sp012 : Result Difference Due To Change In .inc file
+rpl_row_stop_middle : Result Difference Due To Change In .inc file
+rpl_row_trig001 : Result Difference Due To Change In .inc file
+rpl_row_trig002 : Result Difference Due To Change In .inc file
+rpl_row_trig003 : Result Difference Due To Change In .inc file
+rpl_row_view01 : Result Difference Due To Change In .inc file
+rpl_switch_stm_row_mixed : Result Difference Due To Change In .inc file
+rpl_relayspace : Result Difference Due To Change In .inc file
+rpl_row_inexist_tbl : Result Difference Due To Change In .inc file
+rpl_sp : Result Difference Due To Change In .inc file
+rpl_rbr_to_sbr : Result Difference Due To Change In .inc file
+rpl_row_until : Test Timesout

mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test

@@ -43,14 +43,13 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-# Bug#52430 : Uncomment the following lines
+# Bug#52430 
-#             when the bug is fixed 
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 --sorted_result
 SELECT hex(c1),hex(c2),hex(c3) FROM t1;
 DROP TABLE t1;

mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test

@@ -43,14 +43,13 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-# Bug#52430 : Uncomment the following lines
+# Bug#52430 
-#             when the bug is fixed
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 --sorted_result
 SELECT * FROM t1;
 DROP TABLE t1;

mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test

@@ -43,14 +43,13 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-# Bug#52430 : Uncomment the following lines
+# Bug#52430
-#             when the bug is fixed
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
-#INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 --sorted_result
 SELECT * FROM t1;
 DROP TABLE t1;

mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test

@@ -18,10 +18,9 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 BINARY(10) NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES('abc');
 INSERT INTO t1 (c1) VALUES('def');
-# Bug#52430 : Uncomment the following lines
+# Bug#52430
-#             when the bug is fixed
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1) VALUES('abc');
-#INSERT INTO t1 (c1) VALUES('abc');
 SELECT * FROM t1;
 DROP TABLE t1;
 CREATE TABLE t1(c1 VARBINARY(10) NOT NULL PRIMARY KEY);

mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test

@@ -18,10 +18,9 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 BINARY(10) NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES('abc');
 INSERT INTO t1 (c1) VALUES('def');
-# Bug#52430 : Uncomment the following lines
+# Bug#52430
-#             when the bug is fixed
+--error ER_DUP_ENTRY
-#--error ER_DUP_ENTRY
+INSERT INTO t1 (c1) VALUES('abc');
-#INSERT INTO t1 (c1) VALUES('abc');
 SELECT * FROM t1;
 DROP TABLE t1;
 CREATE TABLE t1(c1 VARBINARY(10) NULL UNIQUE);

mysql-test/suite/engines/funcs/t/rpl000013.test

@@ -14,14 +14,22 @@ connection slave;
 sync_with_master;
 connection master;
 
+--disable_query_log
+CALL mtr.add_suppression(" Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
 create table t2(n int);
 create temporary table t1 (n int);
 insert into t1 values(1),(2),(3);
+--disable_warnings
 insert into t2 select * from t1;
+--enable_warnings
 connection master1;
 create temporary table t1 (n int);
 insert into t1 values (4),(5);
+--disable_warnings
 insert into t2 select * from t1 as t10;
+--enable_warnings
 save_master_pos;
 disconnect master;
 connection slave;

mysql-test/suite/engines/funcs/t/rpl_000015.test

@@ -11,25 +11,31 @@ save_master_pos;
 connection slave;
 stop slave;
 reset slave;
-let $status_items= Master_Log_File, Read_Master_Log_Pos, Relay_Master_Log_File, Exec_Master_Log_Pos;
+--vertical_results
-source include/show_slave_status.inc;
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 5 # 8 # 9 # 23 # 33 #
+show slave status;
 
 change master to master_host='127.0.0.1';
 # The following needs to be cleaned up when change master is fixed
-source include/show_slave_status.inc;
+--vertical_results
-
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 5 # 8 # 9 # 23 # 33 #
+show slave status;
 --replace_result $MASTER_MYPORT MASTER_PORT
 eval change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=$MASTER_MYPORT;
-source include/show_slave_status.inc;
+--vertical_results
-
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 5 # 8 # 9 # 23 # 33 #
+show slave status;
 start slave;
 sync_with_master;
-let $status_items= Master_Log_File, Relay_Master_Log_File;
-source include/show_slave_status.inc;
-source include/check_slave_is_running.inc;
-
 --vertical_results
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 5 # 8 # 9 # 23 # 33 #
+--replace_column 33 #
+show slave status;
 connection master;
 --disable_warnings
 drop table if exists t1;

mysql-test/suite/engines/funcs/t/rpl_change_master.test

@@ -18,26 +18,13 @@ save_master_pos;
 connection slave;
 --real_sleep 3 # wait for I/O thread to have read updates
 stop slave;
-source include/wait_for_slave_to_stop.inc;
+--replace_result $MASTER_MYPORT MASTER_MYPORT
-
+--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
-let $read_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1);
+show slave status;
-let $exec_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
-if (`SELECT $read_pos = $exec_pos`)
-{
-  source include/show_rpl_debug_info.inc;
-  echo 'Read_Master_Log_Pos: $read_pos' == 'Exec_Master_Log_Pos: $exec_pos';
-  die Failed because Read_Master_Log_Pos is equal to Exec_Master_Log_Pos;
-} 
 change master to master_user='root';
-let $read_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1);
+--replace_result $MASTER_MYPORT MASTER_MYPORT
-let $exec_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
+--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
-if (`SELECT $read_pos <> $exec_pos`)
+show slave status;
-{
-  source include/show_rpl_debug_info.inc;
-  echo 'Read_Master_Log_Pos: $read_pos' <> 'Exec_Master_Log_Pos: $exec_pos';
-  die Failed because Read_Master_Log_Pos is not equal to Exec_Master_Log_Pos;
-}
-
 start slave;
 sync_with_master;
 select * from t1;

mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test

@@ -8,7 +8,7 @@
 -- source include/master-slave.inc
 
 --disable_query_log
-call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 --enable_query_log
 
 connection master;

mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test

@@ -41,7 +41,8 @@ sleep 5;
 #
 #  Show status of slave
 #
---let status_items= Relay_Log_File
+--replace_result $SLAVE_MYPORT SLAVE_PORT
---source include/show_slave_status.inc
+--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
---source include/check_slave_is_running.inc
+--vertical_results
+SHOW SLAVE STATUS;
 STOP SLAVE;

mysql-test/suite/engines/funcs/t/rpl_get_lock.test

@@ -1,7 +1,7 @@
 source include/master-slave.inc;
 
 --disable_query_log
-call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 --enable_query_log
 
 create table t1(n int);

mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test

@@ -20,7 +20,9 @@ save_master_pos;
 connection slave;
 sync_with_master;
 select count(*) from test.t1; # check that LOAD was replicated
-source include/show_binlog_events.inc;
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
+show binlog events from 107; # should be nothing
 
 # Cleanup
 connection master;

mysql-test/suite/engines/funcs/t/rpl_loadfile.test

@@ -13,7 +13,7 @@
 -- source include/master-slave.inc
 
 --disable_query_log
-call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 --enable_query_log
 
 # Begin clean up test section

mysql-test/suite/engines/funcs/t/rpl_log_pos.test

@@ -11,41 +11,36 @@
 # Passes with rbr no problem, removed statement include [jbm]
 
 source include/master-slave.inc;
-let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
+--replace_column 3 <Binlog_Ignore_DB>
+show master status;
 sync_slave_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 8 # 9 # 23 # 33 #
+show slave status;
 stop slave;
-
+change master to master_log_pos=107;
---replace_result $master_log_pos MASTER_LOG_POS
-eval change master to master_log_pos=$master_log_pos;
 start slave;
 sleep 5;
 stop slave;
-
+change master to master_log_pos=107;
---replace_result $master_log_pos MASTER_LOG_POS
+--replace_result $MASTER_MYPORT MASTER_PORT
-eval change master to master_log_pos=$master_log_pos;
+--replace_column 1 # 8 # 9 # 23 # 33 #
---let $slave_param= Read_Master_Log_Pos
+show slave status;
---let $slave_param_value= $master_log_pos
---source include/wait_for_slave_param.inc
-
 start slave;
 sleep 5;
---let $slave_param= Read_Master_Log_Pos
+--replace_result $MASTER_MYPORT MASTER_PORT
---let $slave_param_value= $master_log_pos
+--replace_column 1 # 8 # 9 # 23 # 33 #
---source include/wait_for_slave_param.inc
+show slave status;
---source include/check_slave_no_error.inc
-
 stop slave;
---echo # impossible position leads to an error
+change master to master_log_pos=178;
---replace_result 177 MASTER_LOG_POS
-change master to master_log_pos=177;
 start slave;
 sleep 2;
-let $slave_io_errno= 1236;
+--replace_result $MASTER_MYPORT MASTER_PORT
-let $show_slave_io_error= 1;
+--replace_column 1 # 8 # 9 # 23 # 33 #
-source include/wait_for_slave_io_error.inc;
+show slave status;
 connection master;
-
+--replace_column 3 <Binlog_Ignore_DB>
-let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
+show master status;
 create table if not exists t1 (n int);
 drop table if exists t1;
 create table t1 (n int);
@@ -53,9 +48,7 @@ insert into t1 values (1),(2),(3);
 save_master_pos;
 connection slave;
 stop slave;
-
+change master to master_log_pos=207;
---replace_result $master_log_pos MASTER_LOG_POS
-eval change master to master_log_pos=$master_log_pos;
 start slave;
 sync_with_master;
 select * from t1 ORDER BY n;

mysql-test/suite/engines/funcs/t/rpl_misc_functions.test

@@ -4,7 +4,7 @@
 source include/master-slave.inc;
 
 --disable_query_log
-call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 --enable_query_log
 
 create table t1(id int, i int, r1 int, r2 int, p varchar(100));

mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test

@@ -9,17 +9,25 @@
 CREATE TABLE t1 (a INT, b LONG);
 INSERT INTO t1 VALUES (1,1), (2,2);
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
+let $VERSION=`select version()`;
+--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 # Different number of binlog events are generated by different engines
 --disable_result_log
-source include/show_binlog_events.inc;
+SHOW BINLOG EVENTS;
 --enable_result_log
 sync_slave_with_master;
 --echo **** On Slave ****
-source include/show_binlog_events.inc;
+--replace_result $MASTER_MYPORT MASTER_PORT
-
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical SHOW SLAVE STATUS
+--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 # Different number of binlog events are generated by different engines
 --disable_result_log
-source include/show_binlog_events.inc;
+SHOW BINLOG EVENTS;
 --enable_result_log
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_slave.sql

mysql-test/suite/engines/funcs/t/rpl_row_drop.test

@@ -30,7 +30,10 @@ connection master;
 --echo **** On Master ****
 # Should drop the non-temporary table t1 and the temporary table t2
 DROP TABLE t1,t2;
-source include/show_binlog_events.inc;
+let $VERSION=`select version()`;
+--replace_result $VERSION VERSION
+--replace_regex /table_id: [0-9]+/table_id: #/
+SHOW BINLOG EVENTS;
 SHOW TABLES;
 sync_slave_with_master;
 --echo **** On Slave ****

mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test

@@ -22,11 +22,13 @@ connection master;
 insert into t1 values (1);
 
 connection slave;
-# slave should have stopped because can't find table t1 
+# slave should have stopped because can't find table t1
+wait_for_slave_to_stop;
 # see if we have a good error message:
---let $slave_sql_errno= 1146
+--replace_result $MASTER_MYPORT MASTER_MYPORT
---let $show_slave_sql_error= 1
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
---source include/wait_for_slave_sql_error.inc
+--vertical_results
+show slave status;
 
 # cleanup
 connection master;

mysql-test/suite/engines/funcs/t/rpl_row_until.test

@@ -18,50 +18,44 @@ connection master;
 # create some events on master
 create table t1(n int not null auto_increment primary key);
 insert into t1 values (1),(2),(3),(4);
-let $master_log_pos_1= query_get_value(SHOW MASTER STATUS, Position, 1);
 drop table t1;
-
 create table t2(n int not null auto_increment primary key);
 insert into t2 values (1),(2);
-let $master_log_pos_2= query_get_value(SHOW MASTER STATUS, Position, 1);
 insert into t2 values (3),(4);
 drop table t2;
 
 # try to replicate all queries until drop of t1
 connection slave;
---replace_result $master_log_pos_1 MASTER_LOG_POS
+start slave until master_log_file='master-bin.000001', master_log_pos=311;
-eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_1;
 sleep 2;
 wait_for_slave_to_stop;
 # here table should be still not deleted
 select * from t1;
---let $slave_param= Exec_Master_Log_Pos
+--vertical_results
---let $slave_param_value= $master_log_pos_1
+--replace_result $MASTER_MYPORT MASTER_MYPORT
---source include/check_slave_param.inc
+--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 #
+show slave status;
 
 # this should fail right after start
---replace_result 291 MASTER_LOG_POS
 start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
 # again this table should be still not deleted
 select * from t1;
 sleep 2;
 wait_for_slave_to_stop;
---let $slave_param= Exec_Master_Log_Pos
+--vertical_results
---let $slave_param_value= $master_log_pos_1
+--replace_result $MASTER_MYPORT MASTER_MYPORT
---source include/check_slave_param.inc
+--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 #
+show slave status;
 
 # try replicate all up to and not including the second insert to t2;
-let $master_log_pos= $master_log_pos_2;
+start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728;
-let $relay_log_file= slave-relay-bin.000004;
---source include/get_relay_log_pos.inc
---replace_result $relay_log_pos RELAY_LOG_POS
-eval start slave until relay_log_file='$relay_log_file', relay_log_pos=$relay_log_pos;
 sleep 2;
 wait_for_slave_to_stop;
 select * from t2;
---let $slave_param= Exec_Master_Log_Pos
+--vertical_results
---let $slave_param_value= $master_log_pos
+--replace_result $MASTER_MYPORT MASTER_MYPORT
---source include/check_slave_param.inc
+--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 #
+show slave status;
 
 # clean up
 start slave;
@@ -71,32 +65,27 @@ connection slave;
 sync_with_master;
 stop slave;
 
---let $exec_log_pos_1= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1)
 # this should stop immediately as we are already there
---replace_result $master_log_pos_2 MASTER_LOG_POS
+start slave until master_log_file='master-bin.000001', master_log_pos=740;
-eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_2;
 sleep 2;
 wait_for_slave_to_stop;
 # here the sql slave thread should be stopped
---let $slave_param= Exec_Master_Log_Pos
+--vertical_results
---let $slave_param_value= $exec_log_pos_1
+--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
---source include/check_slave_param.inc
+--replace_column 1 # 7 # 9 # 22 # 23 # 33 #
+show slave status;
 
 #testing various error conditions
---replace_result 561 MASTER_LOG_POS
 --error 1277
 start slave until master_log_file='master-bin', master_log_pos=561;
---replace_result 561 MASTER_LOG_POS 12 RELAY_LOG_POS
 --error 1277
 start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
 --error 1277
 start slave until master_log_file='master-bin.000001';
 --error 1277
 start slave until relay_log_file='slave-relay-bin.000002';
---replace_result 561 MASTER_LOG_POS
 --error 1277
 start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
 # Warning should be given for second command
 start slave sql_thread;
---replace_result 740 MASTER_LOG_POS
 start slave until master_log_file='master-bin.000001', master_log_pos=740;

mysql-test/suite/engines/funcs/t/rpl_server_id1.test

@@ -12,13 +12,10 @@ reset master;
 stop slave;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval change master to master_port=$SLAVE_MYPORT;
-source include/check_slave_no_error.inc;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
-
+--replace_column 16 # 18 #
+show slave status;
 start slave;
-let $slave_io_errno= 1593;
-let $show_slave_io_error= 1;
-source include/wait_for_slave_io_error.inc;
-
 insert into t1 values (1);
 # can't MASTER_POS_WAIT(), it does not work in this weird setup
 # (when slave is its own master without --replicate-same-server-id)

mysql-test/suite/engines/funcs/t/rpl_server_id2.test

@@ -9,6 +9,9 @@ reset master;
 stop slave;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval change master to master_port=$SLAVE_MYPORT;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+--replace_column 18 #
+show slave status;
 start slave;
 insert into t1 values (1);
 save_master_pos;

mysql-test/suite/engines/funcs/t/rpl_slave_status.test

@@ -22,7 +22,9 @@ drop table if exists t1;
 --enable_warnings
 create table t1 (n int);
 insert into t1 values (1);
-sync_slave_with_master;
+save_master_pos;
+connection slave;
+sync_with_master;
 select * from t1;
 
 # 3. Delete new replication user
@@ -38,8 +40,12 @@ stop slave;
 start slave;
 
 # 5. Make sure Slave_IO_Running = No
-let $slave_io_errno= 1045;
+--replace_result $MASTER_MYPORT MASTER_MYPORT
-source include/wait_for_slave_io_error.inc;
+# Column 1 is replaced, since the output can be either
+# "Connecting to master" or "Waiting for master update"
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 35 # 36 #
+--vertical_results
+show slave status;
 
 # Cleanup (Note that slave IO thread is not running)
 connection slave;

mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test

@@ -510,7 +510,9 @@ INSERT INTO t12 VALUES(UUID());
 UNLOCK TABLES;
 
 --disable_result_log
-source include/show_binlog_events.inc;
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
+show binlog events;
 --enable_result_log
 sync_slave_with_master;
 
@@ -527,7 +529,9 @@ diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_
 
 connection master;
 --disable_result_log
-source include/show_binlog_events.inc;
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
+show binlog events;
 --enable_result_log
 
 # Now test that mysqlbinlog works fine on a binlog generated by the

mysql-test/suite/engines/funcs/t/rpl_temp_table.test

@@ -4,18 +4,26 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/master-slave.inc
 
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
 
 create table t2 (n int, PRIMARY KEY(n));
 create temporary table t1 (n int);
 create temporary table t3 (n int not null);
 
 insert into t1 values(1),(2),(3),(100),(25),(26),(200),(300);
+--disable_warnings
 insert into t2 select * from t1;
+--enable_warnings
 alter table t3 add primary key(n);
 
 flush logs;
 insert into t3 values (1010);
+--disable_warnings
 insert into t2 select * from t3;
+--enable_warnings
 
 drop table if exists t3;
 insert into t2 values (1012);
@@ -23,7 +31,9 @@ insert into t2 values (1012);
 connection master1;
 create temporary table t1 (n int);
 insert into t1 values (4),(5);
+--disable_warnings
 insert into t2 select * from t1;
+--enable_warnings
 
 save_master_pos;
 disconnect master;

mysql-test/suite/engines/funcs/t/rpl_temporary.test

@@ -18,6 +18,10 @@ sync_with_master;
 reset master;
 connection master;
 
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
 connect (con1,localhost,root,,);
 
 #added on 2007/5/18
@@ -62,7 +66,9 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
 connection con1;
 create temporary table t3(f int);
+--disable_warnings
 insert into t3 select * from t1 where f<6;
+--enable_warnings
 sleep 1;
 
 connection con2;
@@ -70,11 +76,15 @@ create temporary table t3(f int);
 sleep 1;
 
 connection con1;
+--disable_warnings
 insert into t2 select count(*) from t3;
+--enable_warnings
 sleep 1;
 
 connection con2;
+--disable_warnings
 insert into t3 select * from t1 where f>=4;
+--enable_warnings
 sleep 1;
 
 connection con1;
@@ -82,7 +92,9 @@ drop temporary table t3;
 sleep 1;
 
 connection con2;
+--disable_warnings
 insert into t2 select count(*) from t3;
+--enable_warnings
 drop temporary table t3;
 
 select * from t2 ORDER BY f;
@@ -107,22 +119,30 @@ SET @@session.pseudo_thread_id=1;
 create temporary table t3(f int);
 SET TIMESTAMP=1040323952;
 SET @@session.pseudo_thread_id=1;
+--disable_warnings
 insert into t3 select * from t1 where f<6;
+--enable_warnings
 SET TIMESTAMP=1040324145;
 SET @@session.pseudo_thread_id=2;
 create temporary table t3(f int);
 SET TIMESTAMP=1040324186;
 SET @@session.pseudo_thread_id=1;
+--disable_warnings
 insert into t2 select count(*) from t3;
+--enable_warnings
 SET TIMESTAMP=1040324200;
 SET @@session.pseudo_thread_id=2;
+--disable_warnings
 insert into t3 select * from t1 where f>=4;
+--enable_warnings
 SET TIMESTAMP=1040324211;
 SET @@session.pseudo_thread_id=1;
 drop temporary table t3;
 SET TIMESTAMP=1040324219;
 SET @@session.pseudo_thread_id=2;
+--disable_warnings
 insert into t2 select count(*) from t3;
+--enable_warnings
 SET TIMESTAMP=1040324224;
 SET @@session.pseudo_thread_id=2;
 drop temporary table t3;
@@ -149,7 +169,9 @@ create table t5 (f int);
 # find dumper's $id
 select id from information_schema.processlist where command='Binlog Dump' into @id;
 kill @id; # to stimulate reconnection by slave w/o timeout
+--disable_warnings
 insert into t5 select * from t4;
+--enable_warnings
 save_master_pos;
 
 connection slave;

mysql-test/suite/engines/funcs/t/rpl_trigger.test

@@ -6,7 +6,7 @@
 --source include/master-slave.inc
 
 disable_query_log;
-call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 enable_query_log;
 
 --disable_warnings

mysql-test/suite/engines/iuds/r/update_delete_calendar.result

@@ -791,6 +791,9 @@ Warning	1292	Truncated incorrect datetime value: '2009-01-10 23:60:59'
 SELECT count(*) FROM t1 WHERE c2='2001-01-11 23:59:60' /* returns 0 */;
 count(*)
 0
+Warnings:
+Warning	1292	Incorrect datetime value: '2001-01-11 23:59:60' for column 'c2' at row 1
+Warning	1292	Incorrect datetime value: '2001-01-11 23:59:60' for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1='0000-00-00 00:00:00' OR c2='0000-00-00 00:00:00';
 c1	c2	c3
 0000-00-00 00:00:00	0000-00-00 00:00:00	6

mysql-test/suite/engines/iuds/r/update_delete_number.result

@@ -63,7 +63,7 @@ c1	c2	c3
 4294967295	2147483647	9
 UPDATE t1 SET c2=-2147483649 WHERE c1=109 ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 13
 SELECT c1,c2 FROM t1 WHERE c1=109;
 c1	c2
 109	-2147483648
@@ -1158,7 +1158,7 @@ c1	c2	c3
 255	127	9
 UPDATE t1 SET c2=-129 WHERE c1=109 ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 13
 SELECT c1,c2 FROM t1 WHERE c1=109;
 c1	c2
 109	-128
@@ -1929,7 +1929,7 @@ c1	c2	c3
 65535	32767	9
 UPDATE t1 SET c2=-32769 WHERE c1=109 ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 13
 SELECT c1,c2 FROM t1 WHERE c1=109;
 c1	c2
 109	-32768
@@ -2676,7 +2676,7 @@ c1	c2	c3
 16777215	8388607	9
 UPDATE t1 SET c2=-8388609 WHERE c1=109 ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 13
 SELECT c1,c2 FROM t1 WHERE c1=109;
 c1	c2
 109	-8388608
@@ -3423,7 +3423,7 @@ c1	c2	c3
 18446744073709551615	9223372036854775807	9
 UPDATE t1 SET c2=-9223372036854775809 WHERE c1=109 ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 13
 SELECT c1,c2 FROM t1 WHERE c1=109;
 c1	c2
 109	-9223372036854775808

mysql-test/suite/engines/iuds/t/disabled.def

@@ -1,2 +1,3 @@
 insert_calendar : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
 update_delete_calendar : Bug#52824 + Bug#52283(in case of Innodb)
+

mysql-test/suite/engines/iuds/t/insert_number.test

@@ -7812,9 +7812,6 @@ SELECT * FROM t2 ORDER BY c1,c6 LIMIT 2;
 SELECT * FROM t2 ORDER BY c1,c6 DESC LIMIT 2;
 
 ## ref type access
-
-# Bug#52283 : Remove the following --disable_warnings
-#             command when the bug is fixed
 --disable_warnings
 SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6;
 SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6 LIMIT 2;

mysql-test/suite/engines/iuds/t/update_delete_calendar.test

@@ -300,12 +300,7 @@ INSERT INTO t1 VALUES('2001-01-09','2001-01-10',6),('2001-01-11','2001-01-12',7)
 UPDATE t1 SET c1='2001-01-09 24:59:59',c2='2009-01-10 23:60:59' WHERE c1='2001-01-09';
 UPDATE t1 SET c2='2001-01-11 23:59:60' WHERE c1='2001-01-11'; 
 SELECT count(*) FROM t1 WHERE c1='2001-01-09 24:59:59' AND c2='2009-01-10 23:60:59';
-
-# Bug#52283 : Remove the following --disable_warnings
-#             command when the bug is fixed
---disable_warnings
 SELECT count(*) FROM t1 WHERE c2='2001-01-11 23:59:60' /* returns 0 */;
---enable_warnings
 --sorted_result
 SELECT * FROM t1 WHERE c1='0000-00-00 00:00:00' OR c2='0000-00-00 00:00:00';