From 0c1a085cca92ce1cbb48cd76eedf65a2130617dc Mon Sep 17 00:00:00 2001
From: unknown <aelkin/elkin@koti.dsl.inet.fi>
Date: Tue, 6 Nov 2007 20:31:40 +0200
Subject: [PATCH] bug#27571

refining non-deterministic tests.
The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.



mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  refining the tests as killing is inherently non-deterministic;
  leaving todos.
---
 mysql-test/r/binlog_killed.result |  4 ++++
 mysql-test/t/binlog_killed.test   | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/mysql-test/r/binlog_killed.result b/mysql-test/r/binlog_killed.result
index eaafc9727cd..e04cc192876 100644
--- a/mysql-test/r/binlog_killed.result
+++ b/mysql-test/r/binlog_killed.result
@@ -17,18 +17,22 @@ delete from t2;
 insert into t1 values (1,1),(2,2);
 begin;
 update t1 set b=11 where a=2;
+begin;
 update t1 set b=b+10;
 kill query ID;
 rollback;
+rollback;
 select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
 2	2
 begin;
 delete from t1 where a=2;
+begin;
 delete from t1 where a=2;
 kill query ID;
 rollback;
+rollback;
 select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
diff --git a/mysql-test/t/binlog_killed.test b/mysql-test/t/binlog_killed.test
index f8ba7c00f48..af78adf0abc 100644
--- a/mysql-test/t/binlog_killed.test
+++ b/mysql-test/t/binlog_killed.test
@@ -79,6 +79,7 @@ begin; update t1 set b=11 where a=2;
 
 connection con2;
 let $ID= `select connection_id()`;
+begin;
 send update t1 set b=b+10;
 
 connection con1;
@@ -86,9 +87,18 @@ connection con1;
 eval kill query $ID;
 rollback;
 
+# Bug #32148  	killi query may be ineffective 
+# forced to comment out the test's outcome 
+# and mask out ineffective ER_QUERY_INTERRUPTED
+# todo1: revert back upon fixing bug#32148
+# todo2: the tests need refining in that
+#        killing should wait till the victim requested
+#        its lock (wait_condition available in 5.1 tests)
+
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+rollback;
 select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 
 #
@@ -123,6 +133,7 @@ begin; delete from t1 where a=2;
 
 connection con2;
 let $ID= `select connection_id()`;
+begin;
 send delete from t1 where a=2;
 
 connection con1;
@@ -133,8 +144,11 @@ rollback;
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+rollback;
+# todo1,2 above
 select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 
+
 #
 # multi delete
 # the same as for multi-update
@@ -178,6 +192,7 @@ rollback;
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+# todo 1,2 above
 rollback;
 select * from t1 /* must be the same as before (1,1),(2,2) */;