From a393b215fb8b335334c9e73ca9e618c563b44835 Mon Sep 17 00:00:00 2001
From: "dkatz@damien-katzs-computer.local" <>
Date: Thu, 21 Jun 2007 21:39:52 -0400
Subject: [PATCH] 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 | 2 +-
 mysql-test/t/kill.test   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index a4966d9d5ec..7ddabe74c5f 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -22,7 +22,7 @@ create table t2 (id int unsigned not null);
 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
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 5f6bae00254..cedca9db3da 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -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;