Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0

mysql-test/r/binlog_killed.result

@@ -6,20 +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));
-kill query 3;
-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%" /* must return 1 */;
-@a like "%insert%"
-1
+select @result /* must be zero either way */;
+@result
+0
 drop table t1,t2,t3;

mysql-test/t/binlog_killed.test

@@ -15,6 +15,7 @@ create table t3 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
 # effective test for bug#22725
 #
 
+let $counter=200; # max 20 seconds to wait for insert performed the 1st row
 connection con1;
 select get_lock("a", 20);
 
@@ -25,12 +26,17 @@ send insert into t2 values (null, null), (null, get_lock("a", 10)),(null, get_lo
 
 
 connection con1;
+
+disable_abort_on_error;
+disable_query_log;
+disable_result_log;
+
 eval kill query $ID;
 
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
-select count(*) from t2 /* must be 3 */;
+let $rows= `select count(*) from t2  /* must be 1 or 0 */`;
 
 --exec $MYSQL_BINLOG --start-position=126 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -38,8 +44,16 @@ eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
 is not null;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval select @a like "%#%error_code=0%" /* must return 1 */;
-eval select @a like "%insert%" /* must return 1 */;
+let $error_code= `select @a like "%#%error_code=0%" /* must return 1 or 0*/`;
+let $insert_binlogged= `select @a like "%insert into%" /* must return 1 or 0 */`;
+eval set @result= $rows-2*$error_code - $insert_binlogged;
+
+enable_abort_on_error;
+enable_query_log;
+enable_result_log;
+
+select @result /* must be zero either way */;
+
 # the functions are either *insensitive* to killing or killing can cause
 # strange problmes with the error propagation out of SF's stack
 #  Bug#27563, Bug#27565, BUG#24971