Commit 8ba0259a authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/kill.test:
  Auto merged
parents 47b8d63d 0abeff72

mysql-test/t/kill.test

+4 −1
Original line number Diff line number Diff line
@@ -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