Merge mysql.com:/home/jimw/my/mysql-4.1-8866

into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged

mysql-test/t/kill.test

@@ -23,12 +23,15 @@ connection con2;
 select ((@id := kill_id) - kill_id) from t1; 
 kill @id;
 
-# Wait for thread to do.
---sleep 5
-# verify that con1 is doning a reconnect
 connection con1;
-ping
-ping
+
+--disable_reconnect
+# this statement should fail
+--error 2006
+select 1;
+--enable_reconnect
+# this should work, and we should have a new connection_id()
+select ((@id := kill_id) - kill_id) from t1;
 select @id != connection_id();
 
 #make sure the server is still alive