Merge mysql.com:/home/jimw/my/mysql-4.1-8731b

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


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

mysql-test/r/wait_timeout.result

@@ -0,0 +1,8 @@
+select 1;
+1
+1
+select 2;
+ERROR HY000: MySQL server has gone away
+select 3;
+3
+3

mysql-test/t/wait_timeout-master.opt

@@ -0,0 +1 @@
+--wait-timeout=2

mysql-test/t/wait_timeout.test

@@ -0,0 +1,11 @@
+#
+# Bug #8731: wait_timeout does not work on Mac OS X
+#
+--disable_reconnect
+select 1;
+# wait_timeout is 2, so we should get disconnected now
+--sleep 5
+--error 2006
+select 2;
+--enable_reconnect
+select 3;