From b3d6cbc25a14cc73c5844b051d76f8967c653121 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 27 Dec 2016 18:13:33 +0100
Subject: [PATCH] cleanup: binlog.binlog_killed_simulate

---
 .../binlog/r/binlog_killed_simulate.result    | 23 ++++----------
 .../binlog/t/binlog_killed_simulate.test      | 30 ++++++-------------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/mysql-test/suite/binlog/r/binlog_killed_simulate.result b/mysql-test/suite/binlog/r/binlog_killed_simulate.result
index b2c9a6f212f..25b00bf8761 100644
--- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result
+++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result
@@ -1,16 +1,10 @@
-drop table if exists t1,t2;
 create table t1  (a int) engine=MyISAM;
 insert into t1 set a=1;
 reset master;
 update t1 set a=2 /* will be "killed" after work has been done */;
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 1 /* must return 1 as query completed before got killed*/;
-1
+set @a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog");
+select @a like '%#%error_code=0%' /* must return 1 as query completed before got killed*/;
+@a like '%#%error_code=0%'
 1
 create table t2 (a int, b int) ENGINE=MyISAM;
 reset master;
@@ -22,14 +16,9 @@ master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=#
 master-bin.000001	#	Query	#	#	COMMIT
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 0 /* must return 0 to mean the killed query is in */;
-0
+set @a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog");
+select @a like '%#%error_code=0%' /* must return 0 to mean the killed query is in */;
+@a like '%#%error_code=0%'
 0
 drop table t1,t2;
 end of the tests
diff --git a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
index e1a1c9de3b2..20f517210b7 100644
--- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test
+++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
@@ -6,10 +6,6 @@
 #           Query_log_event::error_code
 #
 
---disable_warnings
-drop table if exists t1,t2;
---enable_warnings
-
 #
 #  Checking that killing upon successful row-loop does not affect binlogging
 #
@@ -21,20 +17,16 @@ reset master;
 update t1 set a=2 /* will be "killed" after work has been done */;
 
 # a proof the query is binlogged with no error
-let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+let datadir= `select @@datadir`;
+--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_pos $datadir/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
+eval set @a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog");
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`;
-eval select $error_code /* must return 1 as query completed before got killed*/;
+select @a like '%#%error_code=0%' /* must return 1 as query completed before got killed*/;
 
 # cleanup for the sub-case
 remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
 
-
 #
 #  Checking that killing inside of row-loop for LOAD DATA into
 #  non-transactional table affects binlogging
@@ -46,21 +38,17 @@ reset master;
 load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
 
 # a proof the query is binlogged with an error
---let $binlog_load_data= query_get_value(SHOW BINLOG EVENTS, Pos, 5)
---let $binlog_end=       query_get_value(SHOW BINLOG EVENTS, Pos, 6)
+--let binlog_load_data= query_get_value(SHOW BINLOG EVENTS, Pos, 5)
+--let binlog_end=       query_get_value(SHOW BINLOG EVENTS, Pos, 6)
 source include/show_binlog_events.inc;
 
-
 --mkdir $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $datadir/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
+eval set @a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog");
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
-eval select $error_code /* must return 0 to mean the killed query is in */;
+select @a like '%#%error_code=0%' /* must return 0 to mean the killed query is in */;
 
 # cleanup for the sub-case
 remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;