MDEV-571

Adjusted test case results after the merge 10.0-base, 10.0-monty.
The results are in sync with MySQL 5.6.7.

4 files changed, 15 insertions, 26 deletions

diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/r/alter_table-big.result
index 33af60938a1..d1ec258873f 100644
--- a/mysql-test/r/alter_table-big.result
+++ b/mysql-test/r/alter_table-big.result
@@ -14,7 +14,7 @@ set debug_sync='now WAIT_FOR parked';
 insert into t2 values (1);
 insert into t1 values (1, 1, 1);;
 set debug_sync='now SIGNAL go';
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t2 values (1)
@@ -57,7 +57,7 @@ rename table t1 to t3;
 drop table t3;
 set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
 set debug_sync='RESET';
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; alter table t1 change i c char(10) default 'Test1'
 master-bin.000001	#	Query	#	#	BEGIN
diff --git a/mysql-test/r/create-big.result b/mysql-test/r/create-big.result
index 4cce5d8618c..783c646545c 100644
--- a/mysql-test/r/create-big.result
+++ b/mysql-test/r/create-big.result
@@ -186,7 +186,7 @@ t2	CREATE TABLE `t2` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1)
@@ -214,7 +214,7 @@ drop table t1;;
 set debug_sync='now SIGNAL go';
 drop table t2;
 set debug_sync='RESET';
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t2 like t1
 master-bin.000001	#	Query	#	#	BEGIN
diff --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
index e845400b397..895223a8462 100644
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
@@ -2,20 +2,20 @@ SET @def_var= @@session.transaction_prealloc_size;
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST	0.000
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST	0.000
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST	0.000
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST	0.000
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST	0.000
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST	0.000
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST	0.000
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST	0.000
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST	0.000
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST	0.000
diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
index 58098f4c879..c83f3dc2507 100644
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
@@ -42,35 +42,24 @@ SET @def_var= @@session.transaction_prealloc_size;
 
 --disable_warnings
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
-# Embedded server is hardcoded to show "Writing to net" as STATE.
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
-# Embedded server is hardcoded to show "Writing to net" as STATE.
---replace_result "Writing to net" "NULL"
+# Embedded server is shows "cleaning up" as STATE, while non-embedded shows "init"
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 --replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 --replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 --replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 --replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 SHOW PROCESSLIST;
 --enable_warnings