Commit 78df8b4c authored by unknown's avatar unknown
Browse files

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
parents 31d5fbcc 4a9a0b9a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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;