bzr push into mysql-6.0 branch (alik:2743 to 2744) Bug#43325

[Alexander Nozdrin]

 2744 Alexander Nozdrin	2009-03-12
      Bug#43325: Timeout in wait_until_connected_again.inc.
      
      Increase timeout in wait_until_connected_again.inc from 7 to 20 minutes.
      modified:
        mysql-test/include/wait_until_connected_again.inc

 2743 Bjorn Munch	2009-03-10 [merge]
      merge from 6.0-mtr, redo
      added:
        mysql-test/collections/
        mysql-test/collections/README
        mysql-test/collections/README.experimental
        mysql-test/collections/default.daily
        mysql-test/collections/default.experimental
        mysql-test/collections/default.push
        mysql-test/collections/default.weekly
      modified:
        mysql-test/Makefile.am
        mysql-test/include/check-warnings.test
        mysql-test/lib/My/ConfigFactory.pm
        mysql-test/lib/My/Platform.pm
        mysql-test/lib/My/SafeProcess.pm
        mysql-test/lib/My/SafeProcess/safe_process.cc
        mysql-test/lib/mtr_report.pm
        mysql-test/lib/mtr_unique.pm
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc	2009-02-16 21:18:45 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc	2009-03-12 10:01:46 +0000
@@ -9,9 +9,9 @@
 
 --disable_result_log
 --disable_query_log
-# We wait for 7 minutes, because some storage engines need quite
+# We wait for 20 minutes, because some storage engines need quite
 # some to restart with Valgrind runs on Pushbuild.
-let $counter= 4200;
+let $counter= 12000;
 let $mysql_errno= 9999;
 while ($mysql_errno)
 {