bk commit into 5.0 tree (dkatz:1.2502) 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 21:39:52-04:00, dkatz@stripped +2 -0
  Bug #29138  'kill' fails in pushbuild
  
  The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
  
  Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.

  mysql-test/r/kill.result@stripped, 2007-06-21 21:39:48-04:00, dkatz@stripped +1 -1
    We use a much longer running query that doesn't have a chance to fully complete before the reap happens.

  mysql-test/t/kill.test@stripped, 2007-06-21 21:39:48-04:00, dkatz@stripped +3 -1
    We use a much longer running query that doesn't have a chance to fully complete before the reap happens.

# 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_kill

--- 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 21:39:48 -04:00
@@ -22,7 +22,7 @@ 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 from t1 where id in (select distinct a.id from t2 a, t2 b, t2 c, t2 d group by a.id, b.id, c.id, d.id having a.id between 10 and 20);
 select ((@id := kill_id) - kill_id) from t3;
 ((@id := kill_id) - kill_id)
 0

--- 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 21:39:48 -04:00
@@ -81,7 +81,9 @@ connection conn2;
 
 connection conn1;
 -- disable_result_log
-send select id from t1 where id in (select distinct id from t2);
+# This is a very long running query. If this test start failing, it may
+# be necessary to change to an even longer query.
+send select id from t1 where id in (select distinct a.id from t2 a, t2 b, t2 c, t2 d group by a.id, b.id, c.id, d.id having a.id between 10 and 20);
 -- enable_result_log
 
 connection conn2;