fix for tests from engines/funcs

10 files changed, 116 insertions, 370 deletions

diff --git a/mysql-test/suite/engines/funcs/r/rpl_000015.result b/mysql-test/suite/engines/funcs/r/rpl_000015.result
index 7d8fea8f195..56fc002ac53 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_000015.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_000015.result
@@ -7,229 +7,40 @@ master-bin.000001	329
 connection slave;
 include/stop_slave.inc
 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
-Master_SSL_Crl	
-Master_SSL_Crlpath	
-Using_Gtid	No
-Gtid_IO_Pos	
-Replicate_Do_Domain_Ids	
-Replicate_Ignore_Domain_Ids	
-Parallel_Mode	conservative
-SQL_Delay	0
-SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	
+Slave_IO_Running = 'No'
+Slave_SQL_Running = 'No'
+Last_SQL_Errno = '0'
+Last_SQL_Error = ''
+Exec_Master_Log_Pos = '0'
 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
-Master_SSL_Crl	
-Master_SSL_Crlpath	
-Using_Gtid	No
-Gtid_IO_Pos	
-Replicate_Do_Domain_Ids	
-Replicate_Ignore_Domain_Ids	
-Parallel_Mode	conservative
-SQL_Delay	0
-SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	
-change master to master_host='127.0.0.1',master_user='root',
+Slave_IO_Running = 'No'
+Slave_SQL_Running = 'No'
+Last_SQL_Errno = '0'
+Last_SQL_Error = ''
+Exec_Master_Log_Pos = '0'
+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
-Master_SSL_Crl	
-Master_SSL_Crlpath	
-Using_Gtid	No
-Gtid_IO_Pos	
-Replicate_Do_Domain_Ids	
-Replicate_Ignore_Domain_Ids	
-Parallel_Mode	conservative
-SQL_Delay	0
-SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	
 include/start_slave.inc
-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	329
-Relay_Log_File	slave-relay-bin.000002
-Relay_Log_Pos	629
-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	329
-Relay_Log_Space	938
-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
-Master_SSL_Crl	
-Master_SSL_Crlpath	
-Using_Gtid	No
-Gtid_IO_Pos	
-Replicate_Do_Domain_Ids	
-Replicate_Ignore_Domain_Ids	
-Parallel_Mode	conservative
-SQL_Delay	0
-SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_IO_Running = 'Yes'
+Slave_SQL_Running = 'Yes'
+Last_SQL_Errno = '0'
+Last_SQL_Error = ''
+Exec_Master_Log_Pos = '329'
 connection master;
-drop table if exists t1;
 create table t1 (n int, PRIMARY KEY(n));
 insert into t1 values (10),(45),(90);
 connection slave;
-connection slave;
 SELECT * FROM t1 ORDER BY n;
-n	10
-n	45
-n	90
+n
+10
+45
+90
 connection master;
 SELECT * FROM t1 ORDER BY n;
-n	10
-n	45
-n	90
+n
+10
+45
+90
 drop table t1;
 connection slave;
 include/rpl_end.inc
diff --git a/mysql-test/suite/engines/funcs/r/rpl_do_grant.result b/mysql-test/suite/engines/funcs/r/rpl_do_grant.result
index 9eca21b38e4..0797e66e9ec 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_do_grant.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_do_grant.result
@@ -15,8 +15,8 @@ grant drop on test.* to rpl_do_grant@localhost;
 connection slave;
 show grants for rpl_do_grant@localhost;
 Grants for rpl_do_grant@localhost
-GRANT SELECT ON *.* TO 'rpl_do_grant'@'localhost'
-GRANT DROP ON `test`.* TO 'rpl_do_grant'@'localhost'
+GRANT SELECT ON *.* TO `rpl_do_grant`@`localhost`
+GRANT DROP ON `test`.* TO `rpl_do_grant`@`localhost`
 connection master;
 set password for rpl_do_grant@localhost=password("does it work?");
 connection slave;
@@ -54,55 +54,55 @@ connection master;
 create user rpl_do_grant@localhost;
 show grants for rpl_do_grant@localhost;
 Grants for rpl_do_grant@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant`@`localhost`
 show grants for rpl_do_grant2@localhost;
 ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost'
 connection slave;
 show grants for rpl_do_grant@localhost;
 Grants for rpl_do_grant@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant`@`localhost`
 show grants for rpl_do_grant2@localhost;
 ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost'
 connection master;
 rename user rpl_do_grant@localhost to rpl_do_grant2@localhost;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
 connection slave;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
 connection master;
 grant DELETE,INSERT on mysqltest1.* to rpl_do_grant2@localhost;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
-GRANT INSERT, DELETE ON `mysqltest1`.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
+GRANT INSERT, DELETE ON `mysqltest1`.* TO `rpl_do_grant2`@`localhost`
 connection slave;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
-GRANT INSERT, DELETE ON `mysqltest1`.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
+GRANT INSERT, DELETE ON `mysqltest1`.* TO `rpl_do_grant2`@`localhost`
 connection master;
 revoke DELETE on mysqltest1.* from rpl_do_grant2@localhost;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
-GRANT INSERT ON `mysqltest1`.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
+GRANT INSERT ON `mysqltest1`.* TO `rpl_do_grant2`@`localhost`
 connection slave;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
-GRANT INSERT ON `mysqltest1`.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
+GRANT INSERT ON `mysqltest1`.* TO `rpl_do_grant2`@`localhost`
 connection master;
 revoke all privileges, grant option from rpl_do_grant2@localhost;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
 connection slave;
 show grants for rpl_do_grant2@localhost;
 Grants for rpl_do_grant2@localhost
-GRANT USAGE ON *.* TO 'rpl_do_grant2'@'localhost'
+GRANT USAGE ON *.* TO `rpl_do_grant2`@`localhost`
 connection master;
 drop user rpl_do_grant2@localhost;
 show grants for rpl_do_grant2@localhost;
@@ -142,9 +142,9 @@ Host	Db	User	Routine_name	Routine_type	Grantor	Proc_priv	Timestamp
 localhost	bug42217_db	create_rout_db	upgrade_del_func	FUNCTION	create_rout_db@localhost	Execute,Alter Routine	#
 SHOW GRANTS FOR 'create_rout_db'@'localhost';
 Grants for create_rout_db@localhost
-GRANT USAGE ON *.* TO 'create_rout_db'@'localhost' IDENTIFIED BY PASSWORD '*08792480350CBA057BDE781B9DF183B263934601'
-GRANT CREATE ROUTINE ON `bug42217_db`.* TO 'create_rout_db'@'localhost' WITH GRANT OPTION
-GRANT EXECUTE, ALTER ROUTINE ON FUNCTION `bug42217_db`.`upgrade_del_func` TO 'create_rout_db'@'localhost'
+GRANT USAGE ON *.* TO `create_rout_db`@`localhost` IDENTIFIED BY PASSWORD '*08792480350CBA057BDE781B9DF183B263934601'
+GRANT CREATE ROUTINE ON `bug42217_db`.* TO `create_rout_db`@`localhost` WITH GRANT OPTION
+GRANT EXECUTE, ALTER ROUTINE ON FUNCTION `bug42217_db`.`upgrade_del_func` TO `create_rout_db`@`localhost`
 USE bug42217_db;
 SHOW CREATE FUNCTION upgrade_del_func;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
@@ -236,11 +236,11 @@ GRANT EXECUTE ON PROCEDURE p1 TO 'user49119'@'localhost';
 ### Showing grants for both users: root and user49119 (master)
 SHOW GRANTS FOR 'user49119'@'localhost';
 Grants for user49119@localhost
-GRANT USAGE ON *.* TO 'user49119'@'localhost'
-GRANT EXECUTE ON PROCEDURE `test`.`p1` TO 'user49119'@'localhost'
+GRANT USAGE ON *.* TO `user49119`@`localhost`
+GRANT EXECUTE ON PROCEDURE `test`.`p1` TO `user49119`@`localhost`
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
 ##############################################################
 connection slave;
@@ -248,11 +248,11 @@ connection slave;
 ### Showing grants for both users: root and user49119 (master)
 SHOW GRANTS FOR 'user49119'@'localhost';
 Grants for user49119@localhost
-GRANT USAGE ON *.* TO 'user49119'@'localhost'
-GRANT EXECUTE ON PROCEDURE `test`.`p1` TO 'user49119'@'localhost'
+GRANT USAGE ON *.* TO `user49119`@`localhost`
+GRANT EXECUTE ON PROCEDURE `test`.`p1` TO `user49119`@`localhost`
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
 ##############################################################
 connection master;
@@ -266,10 +266,10 @@ ERROR 42000: There is no such grant defined for user 'root' on host 'localhost'
 ### after revoke statement failure
 SHOW GRANTS FOR 'user49119'@'localhost';
 Grants for user49119@localhost
-GRANT USAGE ON *.* TO 'user49119'@'localhost'
+GRANT USAGE ON *.* TO `user49119`@`localhost`
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
 ##############################################################
 connection slave;
@@ -278,10 +278,10 @@ connection slave;
 ### after revoke statement failure (should match 
 SHOW GRANTS FOR 'user49119'@'localhost';
 Grants for user49119@localhost
-GRANT USAGE ON *.* TO 'user49119'@'localhost'
+GRANT USAGE ON *.* TO `user49119`@`localhost`
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
 ##############################################################
 connection master;
diff --git a/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result b/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
index 4a56880d97f..527dd8dc983 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
@@ -10,56 +10,5 @@ change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=SLAVE_PORT;
 include/start_slave.inc
 flush logs;
-SHOW SLAVE STATUS;
-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	328
-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	328
-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
-Master_SSL_Crl	
-Master_SSL_Crlpath	
-Using_Gtid	No
-Gtid_IO_Pos	
-Replicate_Do_Domain_Ids	
-Replicate_Ignore_Domain_Ids	
-Parallel_Mode	conservative
-SQL_Delay	0
-SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
-stop slave;
+include/stop_slave.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result b/mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result
index 29e6bb6d6a4..0a5564ac6c0 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result
@@ -15,8 +15,8 @@ grant select on *.* to rpl_ignore_grant@localhost;
 grant drop on test.* to rpl_ignore_grant@localhost;
 show grants for rpl_ignore_grant@localhost;
 Grants for rpl_ignore_grant@localhost
-GRANT SELECT ON *.* TO 'rpl_ignore_grant'@'localhost'
-GRANT DROP ON `test`.* TO 'rpl_ignore_grant'@'localhost'
+GRANT SELECT ON *.* TO `rpl_ignore_grant`@`localhost`
+GRANT DROP ON `test`.* TO `rpl_ignore_grant`@`localhost`
 connection slave;
 show grants for rpl_ignore_grant@localhost;
 ERROR 42000: There is no such grant defined for user 'rpl_ignore_grant' on host 'localhost'
diff --git a/mysql-test/suite/engines/funcs/r/rpl_server_id1.result b/mysql-test/suite/engines/funcs/r/rpl_server_id1.result
index 3f318a0a664..001d1151843 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_server_id1.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_server_id1.result
@@ -5,9 +5,11 @@ create table t1 (n int);
 reset master;
 include/stop_slave.inc
 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	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State
-	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No				#		#	0		0	0	256	None		0	No						NULL	No	0		0			1			No				conservative	0	NULL	
+Slave_IO_Running = 'No'
+Slave_SQL_Running = 'No'
+Last_SQL_Errno = '0'
+Last_SQL_Error = ''
+Exec_Master_Log_Pos = '0'
 start slave;
 insert into t1 values (1);
 include/wait_for_slave_param.inc [Last_IO_Errno]
diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result
index e19732fe7ff..0e5929bcbd7 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_sp.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result
@@ -16,7 +16,7 @@ insert into t1 values (b);
 insert into t1 values (unix_timestamp());
 end|
 select * from mysql.proc where name='foo' and db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 mysqltest1	foo	PROCEDURE	foo	SQL	CONTAINS_SQL	NO	DEFINER			begin
 declare b int;
 set b = 8;
@@ -27,10 +27,10 @@ declare b int;
 set b = 8;
 insert into t1 values (b);
 insert into t1 values (unix_timestamp());
-end
+end	NONE
 connection slave;
 select * from mysql.proc where name='foo' and db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 mysqltest1	foo	PROCEDURE	foo	SQL	CONTAINS_SQL	NO	DEFINER			begin
 declare b int;
 set b = 8;
@@ -41,7 +41,7 @@ declare b int;
 set b = 8;
 insert into t1 values (b);
 insert into t1 values (unix_timestamp());
-end
+end	NONE
 connection master;
 set timestamp=1000000000;
 call foo();
@@ -126,25 +126,26 @@ ERROR 23000: Duplicate entry '20' for key 'a'
 show warnings;
 Level	Code	Message
 Error	1062	Duplicate entry '20' for key 'a'
+Note	4094	At line 4 in mysqltest1.foo4
 select * from t2;
 a
 connection slave;
 select * from t2;
 a
 select * from mysql.proc where name="foo4" and db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 mysqltest1	foo4	PROCEDURE	foo4	SQL	CONTAINS_SQL	YES	DEFINER			begin
 insert into t2 values(20),(20);
 end	root@localhost	#	#			latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 insert into t2 values(20),(20);
-end
+end	NONE
 connection master;
 drop procedure foo4;
 select * from mysql.proc where name="foo4" and db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 connection slave;
 select * from mysql.proc where name="foo4" and db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 connection master;
 drop procedure foo;
 drop procedure foo2;
@@ -234,22 +235,22 @@ select fn3();
 fn3()
 0
 select * from mysql.proc where db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 mysqltest1	fn1	FUNCTION	fn1	SQL	NO_SQL	NO	DEFINER		int(11)	begin
 return unix_timestamp();
 end	root@localhost	#	#			latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return unix_timestamp();
-end
+end	NONE
 mysqltest1	fn2	FUNCTION	fn2	SQL	NO_SQL	NO	DEFINER		int(11)	begin
 return unix_timestamp();
 end	zedjzlcsjhd@localhost	#	#	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return unix_timestamp();
-end
+end	NONE
 mysqltest1	fn3	FUNCTION	fn3	SQL	READS_SQL_DATA	NO	DEFINER		int(11)	begin
 return 0;
 end	root@localhost	#	#			latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return 0;
-end
+end	NONE
 select * from t1;
 a
 1000000000
@@ -259,22 +260,22 @@ select * from t1;
 a
 1000000000
 select * from mysql.proc where db='mysqltest1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8	aggregate
 mysqltest1	fn1	FUNCTION	fn1	SQL	NO_SQL	NO	DEFINER		int(11)	begin
 return unix_timestamp();
 end	root@localhost	#	#			latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return unix_timestamp();
-end
+end	NONE
 mysqltest1	fn2	FUNCTION	fn2	SQL	NO_SQL	NO	DEFINER		int(11)	begin
 return unix_timestamp();
 end	zedjzlcsjhd@localhost	#	#	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return unix_timestamp();
-end
+end	NONE
 mysqltest1	fn3	FUNCTION	fn3	SQL	READS_SQL_DATA	NO	DEFINER		int(11)	begin
 return 0;
 end	root@localhost	#	#			latin1	latin1_swedish_ci	latin1_swedish_ci	begin
 return 0;
-end
+end	NONE
 connection master;
 delete from t2;
 alter table t2 add unique (a);
@@ -290,6 +291,7 @@ end|
 do fn1(100);
 Warnings:
 Error	1062	Duplicate entry '100' for key 'a'
+Note	4094	At line 3 in mysqltest1.fn1
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'
 select * from t2;
@@ -794,19 +796,19 @@ insert into t1 values (b);
 insert into t1 values (unix_timestamp());
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values ( NAME_CONST('b',8))
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values (unix_timestamp())
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete from t1
@@ -851,20 +853,20 @@ insert into t2 values(3);
 insert into t1 values (5);
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t2 values(3)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 SET @@session.sql_mode=0/*!*/;
 insert into t1 values (15)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 SET @@session.sql_mode=1411383296/*!*/;
@@ -875,20 +877,20 @@ SET TIMESTAMP=t/*!*/;
 SET @@session.sql_mode=0/*!*/;
 alter procedure foo4 sql security invoker
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 SET @@session.sql_mode=1411383296/*!*/;
 insert into t2 values(3)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values (5)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -928,7 +930,7 @@ insert into t1 values (x);
 return x+2;
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete t1,t2 from t1,t2
@@ -936,13 +938,13 @@ delete t1,t2 from t1,t2
 SET TIMESTAMP=t/*!*/;
 COMMIT
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest1`.`fn1`(20)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t2 values(fn1(21))
@@ -958,13 +960,13 @@ begin
 return unix_timestamp();
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete from t1
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values(fn1())
@@ -986,7 +988,7 @@ begin
 return 0;
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete from t2
@@ -1005,7 +1007,7 @@ insert into t2 values(x),(x);
 return 10;
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete from t1
@@ -1014,13 +1016,13 @@ COMMIT/*!*/;
 SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values (1)
 /*!*/;
 COMMIT/*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 delete from t1
@@ -1029,7 +1031,7 @@ COMMIT/*!*/;
 SET TIMESTAMP=t/*!*/;
 drop trigger trg
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 values (1)
@@ -1074,7 +1076,7 @@ CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
 SET TIMESTAMP=t/*!*/;
 create table t1 (a int)
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t1 (a) values (f1())
@@ -1099,7 +1101,7 @@ SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(arg VARCHAR(10))
 INSERT INTO t1 VALUES(arg)
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test' COLLATE 'latin1_swedish_ci'))
@@ -1151,7 +1153,7 @@ SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqltest`.`test`()
 begin end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 insert into t values ( 1 )
@@ -1164,7 +1166,7 @@ insert into t values (1);
 return 0;
 end
 /*!*/;
-BEGIN
+START TRANSACTION
 /*!*/;
 use `mysqltest`/*!*/;
 SET TIMESTAMP=t/*!*/;
diff --git a/mysql-test/suite/engines/funcs/t/rpl_000015.test b/mysql-test/suite/engines/funcs/t/rpl_000015.test
index 8d76fc674e5..8996affe667 100644
--- a/mysql-test/suite/engines/funcs/t/rpl_000015.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_000015.test
@@ -11,39 +11,25 @@ save_master_pos;
 connection slave;
 --source include/stop_slave.inc
 reset slave;
---vertical_results
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 5 # 8 # 9 # 23 # 33 #
-show slave status;
+--let $status_items= Slave_IO_Running, Slave_SQL_Running, Last_SQL_Errno, Last_SQL_Error, Exec_Master_Log_Pos
+--source include/show_slave_status.inc
 
 change master to master_host='127.0.0.1';
 # The following needs to be cleaned up when change master is fixed
---vertical_results
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 5 # 8 # 9 # 23 # 33 #
-show slave status;
+--source include/show_slave_status.inc
 --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;
---vertical_results
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 5 # 8 # 9 # 23 # 33 #
-show slave status;
+eval change master to master_host='127.0.0.1',master_user='root', 
+master_password='',master_port=$MASTER_MYPORT;
 --source include/start_slave.inc
 sync_with_master;
---vertical_results
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 5 # 8 # 9 # 23 # 33 #
---replace_column 33 #
-show slave status;
+--source include/show_slave_status.inc
+
 connection master;
---disable_warnings
-drop table if exists t1;
---enable_warnings
+
 create table t1 (n int, PRIMARY KEY(n));
 insert into t1 values (10),(45),(90);
 --sync_slave_with_master
-connection slave;
+
 SELECT * FROM t1 ORDER BY n;
 connection master;
 SELECT * FROM t1 ORDER BY n;
diff --git a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
index 93207dfddf7..b4742246264 100644
--- a/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
@@ -32,9 +32,6 @@ sleep 5;
 #
 #  Show status of slave
 #
---replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 1 # 8 # 9 # 16 # 23 # 33 #
---vertical_results
-SHOW SLAVE STATUS;
-stop slave;
+--let $status_items= Slave_IO_Running, Slave_SQL_Running, Last_SQL_Errno, Last_SQL_Error, Exec_Master_Log_Pos
+--source include/stop_slave.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/engines/funcs/t/rpl_server_id1.test b/mysql-test/suite/engines/funcs/t/rpl_server_id1.test
index a1425531b2c..1412db46d3a 100644
--- a/mysql-test/suite/engines/funcs/t/rpl_server_id1.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_server_id1.test
@@ -12,9 +12,8 @@ reset master;
 --source include/stop_slave.inc
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval change master to master_port=$SLAVE_MYPORT;
---replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 16 # 18 #
-show slave status;
+--let $status_items= Slave_IO_Running, Slave_SQL_Running, Last_SQL_Errno, Last_SQL_Error, Exec_Master_Log_Pos
+--source include/show_slave_status.inc
 start slave;
 insert into t1 values (1);
 
diff --git a/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
index cd826c6be1e..2a16d90f9ad 100644
--- a/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_switch_stm_row_mixed.inc
+--source suite/rpl/include/rpl_switch_stm_row_mixed.inc