bk commit into 5.1 tree (aelkin:1.2613) BUG#27571

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 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 13:08:37+02:00, aelkin@stripped +1 -0
  bug#27571
  
  non-deterministic tests refining.
  This particular patch tested on two archs.

  mysql-test/suite/binlog/t/binlog_killed.test@stripped, 2007-11-06 13:08:34+02:00, aelkin@stripped +9 -2
    deploying synchronization of killing with reaching the explected state
    of the prey's connection.

diff -Nrup a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2007-11-06 11:53:44 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2007-11-06 13:08:34 +02:00
@@ -218,11 +218,15 @@ set @b= 0;
 send update t4 set b=b + bug27563(b);
 
 connection con1;
+let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+source include/wait_condition.inc;
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+
 --replace_result $ID ID
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
+--error ER_QUERY_INTERRUPTED
 reap;
 select * from t4 order by b /* must be (1,1), (1,2) */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;
@@ -261,11 +265,14 @@ set @b= 0;
 send delete from t4 where b=bug27563(1) or b=bug27563(2);
 
 connection con1;
+let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+source include/wait_condition.inc;
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
 --replace_result $ID ID
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
+--error ER_QUERY_INTERRUPTED
 reap;
 select count(*) from t4 /* must be 1 */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;