Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/t/kill.test:
  Auto merged

mysql-test/t/kill.test

@@ -25,6 +25,7 @@ select ((@id := kill_id) - kill_id) from t1;
 kill @id;
 
 connection con1;
+--sleep 1
 
 # this statement should fail
 --error 2006,2013