Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

mysql-test/r/kill.result

@@ -29,18 +29,6 @@ select ((@id := kill_id) - kill_id) from t3;
 kill @id;
 Got one of the listed errors
 drop table t1, t2, t3;
-create table t1 (id int primary key);
-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 := 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

mysql-test/t/kill.test

@@ -47,7 +47,6 @@ connection con2;
 select 4;
 drop table t1;
 connection default;
-disconnect con2;
 
 --error 1064
 kill (select count(*) from mysql.user);