bk commit into 5.0 tree (aelkin:1.2552) BUG#27571

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-06 20:31:40+02:00, aelkin@stripped +2 -0
  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@stripped, 2007-11-06 20:31:37+02:00, aelkin@stripped +4 -0
    results changed

  mysql-test/t/binlog_killed.test@stripped, 2007-11-06 20:31:37+02:00, aelkin@stripped +15 -0
    refining the tests as killing is inherently non-deterministic;
    leaving todos.

diff -Nrup a/mysql-test/r/binlog_killed.result b/mysql-test/r/binlog_killed.result
--- a/mysql-test/r/binlog_killed.result	2007-11-06 13:53:23 +02:00
+++ b/mysql-test/r/binlog_killed.result	2007-11-06 20:31:37 +02:00
@@ -17,17 +17,21 @@ 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
diff -Nrup a/mysql-test/t/binlog_killed.test b/mysql-test/t/binlog_killed.test
--- a/mysql-test/t/binlog_killed.test	2007-11-06 13:53:24 +02:00
+++ b/mysql-test/t/binlog_killed.test	2007-11-06 20:31:37 +02:00
@@ -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) */;