bk commit into 5.0 tree (dkatz:1.2497) BUG#29138

[damien]

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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-06-21 17:22:57-04:00, dkatz@stripped +2 -0
  Bug #29138  	'kill' fails in pushbuild
  
  This is not a complete submission. Checking in for collaboration.

  mysql-test/r/kill.result@stripped, 2007-06-21 17:22:55-04:00, dkatz@stripped +0 -6
    d

  mysql-test/t/kill.test@stripped, 2007-06-21 17:22:55-04:00, dkatz@stripped +50 -12
    This is an attempt to put the individual test in big loop where more sleep time is given each time it fails, in hopes of keeps the tests fast on fast machines/OSes and allowing for slow machines to run the tests successfully.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dkatz
# Host:	damien-katzs-computer.local
# Root:	/Users/dkatz/50

--- 1.18/mysql-test/r/kill.result	2007-05-31 03:10:09 -04:00
+++ 1.19/mysql-test/r/kill.result	2007-06-21 17:22:55 -04:00
@@ -22,12 +22,6 @@ create table t2 (id int unsigned not nul
 insert into t2 select id from t1;
 create table t3 (kill_id int);
 insert into t3 values(connection_id());
-select id from t1 where id in (select distinct id from t2);
-select ((@id := kill_id) - kill_id) from t3;
-((@id := kill_id) - kill_id)
-0
-kill @id;
-Got one of the listed errors
 drop table t1, t2, t3;
 select get_lock("a", 10);
 get_lock("a", 10)

--- 1.26/mysql-test/t/kill.test	2007-05-31 03:10:08 -04:00
+++ 1.27/mysql-test/t/kill.test	2007-06-21 17:22:55 -04:00
@@ -77,23 +77,61 @@ create table t3 (kill_id int);
 insert into t3 values(connection_id());
 
 connect (conn2, localhost, root,,);
-connection conn2;
 
-connection conn1;
+
 -- disable_result_log
-send select id from t1 where id in (select distinct id from t2);
+-- disable_query_log
+
+let $counter= 5;
+let $sleeptime= 0;
+let $success= 0;
+while ($counter)
+{
+    dec $counter;
+    
+    connection conn1;
+    
+    send select id from t1 where id in (select distinct id from t2);
+    
+    connection conn2;
+    select ((@id := kill_id) - kill_id) from t3;
+    kill @id;
+    
+    let $i= $sleeptime;    
+    while ($i)
+    {
+      real_sleep 1;
+      dec $i;
+    }
+    
+    connection conn1;
+    
+    --error 0,2013
+    reap;
+    
+    if ($mysql_errno)
+    {
+      let $counter= 0;
+      let $success= 1;
+    }
+    if (!$mysql_errno)
+    {
+      real_sleep 1;
+      inc $sleeptime;
+      connect (conn2, localhost, root,,);
+    }
+}
+
+
 -- enable_result_log
+-- enable_query_log
 
-connection conn2;
-select ((@id := kill_id) - kill_id) from t3;
--- sleep 1
-kill @id;
-
-connection conn1;
--- error 1053,2013
-reap;
+if (!$success)
+{
+  echo "Test failed.";
+}  
 
-connection default;
+connection conn2;
 
 drop table t1, t2, t3;