bk commit into 5.0 tree (msvensson:1.2347)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2006-12-08 17:09:43+01:00, msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2867.30

  mysql-test/t/kill.test@stripped, 2006-12-08 17:09:39+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.6.1.8

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.23/mysql-test/t/kill.test	2006-12-08 17:09:48 +01:00
+++ 1.24/mysql-test/t/kill.test	2006-12-08 17:09:48 +01:00
@@ -76,11 +76,14 @@ insert into t2 select id from t1;
 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);
 -- enable_result_log
 
-connect (conn2, localhost, root,,);
 connection conn2;
 select ((@id := kill_id) - kill_id) from t3;
 -- sleep 1