bzr commit into mysql-6.0-falcon-team branch (hky:2911) Bug#40636

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team-to-merge/

 2911 Hakan Kuecuekyilmaz	2008-11-13
      Fix for Bug#40636
          falcon_bug_28095 test fails with "Server failed to restart" in valgrind runs.
modified:
  mysql-test/include/restart_mysqld.inc
  mysql-test/include/wait_until_connected_again.inc
  mysql-test/suite/falcon/t/falcon_bug_28095.test

per-file messages:
  mysql-test/include/restart_mysqld.inc
    Increased wait time for mysqld to shut down.
  mysql-test/include/wait_until_connected_again.inc
    Increased wait time for mysqld to start again.
  mysql-test/suite/falcon/t/falcon_bug_28095.test
    Runs on Valgrind again.
=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2008-11-03 17:51:36 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2008-11-13 14:55:42 +0000
@@ -1,4 +1,4 @@
-
+#
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
 --write_file $MYSQLTEST_VARDIR/tmp/master0.expect
@@ -6,8 +6,8 @@ wait
 EOF
 
 # Send shutdown to the connected server and give
-# it 10 seconds to die before zapping it
-shutdown_server 10;
+# it 30 seconds to die before zapping it.
+shutdown_server 30;
 
 # Check server is gone
 --source include/wait_until_disconnected.inc

=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc	2008-11-03 17:51:36 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc	2008-11-13 14:55:42 +0000
@@ -4,7 +4,7 @@
 # You should have done --enable_reconnect first
 --disable_result_log
 --disable_query_log
-let $counter= 300;
+let $counter= 600;
 let $mysql_errno= 9999;
 while ($mysql_errno)
 {
@@ -19,7 +19,7 @@ while ($mysql_errno)
   {
     --die Server failed to restart
   }
-  --sleep 0.1
+  --real_sleep 0.1
 }
 --enable_query_log
 --enable_result_log

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-11 12:47:29 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-13 14:55:42 +0000
@@ -7,15 +7,6 @@
 #    server restart with --shutdown_server. We do the
 #    restart with the help of include/restart_mysqld.inc.
 #
-
-####
-# Temp: Due to Bug#40636 (falcon_bug_28095 test fails with 
-# "Server failed to restart" in valgrind runs) this test is 
-# disabled in valgrind runs.
-# Re-enable when "soft" server restart works with Valgrind.
-####
---source include/not_valgrind.inc
-
 --echo *** Bug #28095: First phase ***
 
 # ----------------------------------------------------- #