Merge mysql.com:/usr/local/mysql/tmp-5.0

into  mysql.com:/usr/local/mysql/tmp-5.1


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

mysql-test/t/wait_timeout.test

@@ -11,6 +11,7 @@
 connect (wait_con,localhost,root,,test,,);
 flush status; # Reset counters
 connection wait_con;
+set session wait_timeout=100;
 let $retries=300;
 let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
 set @aborted_clients= 0;