bug#22725

combining the final result variable in such way that either option of the test execution
will yield zero.


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  there are two options for the test passing:
  1. no rows inserted and the INSERT gets killed, then there is no INSERT query in binlog
  2. all rows inserted, then INSERT gets to binlog and error_code is zero

1 files changed, 3 insertions, 15 deletions

diff --git a/mysql-test/r/binlog_killed.result b/mysql-test/r/binlog_killed.result
index 368df408cb8..60fc403aeb3 100644
--- a/mysql-test/r/binlog_killed.result
+++ b/mysql-test/r/binlog_killed.result
@@ -6,19 +6,7 @@ get_lock("a", 20)
 1
 reset master;
 insert into t2 values (null, null), (null, get_lock("a", 10)),(null, get_lock("a", 10));
-select count(*) from t2 /* must be 3 */;
-count(*)
-3
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
-is not null
-1
-select @a like "%#%error_code=0%" /* must return 1 */;
-@a like "%#%error_code=0%"
-1
-select @a like "%insert into%" /* must return 1 */;
-@a like "%insert into%"
-1
+select @result /* must be zero either way */;
+@result
+0
 drop table t1,t2,t3;