bk commit into 5.0 tree (msvensson:1.2576)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-05 15:05:33+01:00, msvensson@shellback.(none) +1 -0
  Set shutdown_timeout to 0 when using --fast

  mysql-test/mysql-test-run.pl@stripped, 2007-11-05 15:05:27+01:00, msvensson@shellback.(none) +11 -10
    Set shutdown_timeout to 0 when using --fast

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-11-05 13:53:43 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-11-05 15:05:27 +01:00
@@ -741,6 +741,13 @@ sub command_line_setup {
   $opt_tmpdir =~ s,/+$,,;       # Remove ending slash if any
 
   # --------------------------------------------------------------------------
+  # fast option
+  # --------------------------------------------------------------------------
+  if ($opt_fast){
+    $opt_shutdown_timeout= 0; # Kill processes instead of nice shutdown
+  }
+
+  # --------------------------------------------------------------------------
   # Check im support
   # --------------------------------------------------------------------------
   if ($opt_extern)
@@ -3832,12 +3839,6 @@ sub run_testcase_need_slave_restart($) {
 }
 
 
-sub shutdown_timeout {
-  # Use shutdown_timeout 0 if --fast
-  return $opt_fast ? 0 : $opt_shutdown_timeout;
-}
-
-
 #
 # Return a list of all servers
 #
@@ -3867,11 +3868,11 @@ sub run_testcase_stop_servers($$$) {
     delete $master->[0]->{'running_master_options'}; # Forget history
 
     # Master mysqld's
-    My::SafeProcess::shutdown( shutdown_timeout(), started(@{$master}) );
+    My::SafeProcess::shutdown( $opt_shutdown_timeout, started(@{$master}) );
 
     # Master cluster
     my $cluster= $clusters->[0];
-    My::SafeProcess::shutdown( shutdown_timeout(),
+    My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started($cluster, @{$cluster->{'ndbds'}}) );
     # Mark servers as stopped
     map($_->{proc}= undef, @{$master}, $cluster, @{$cluster->{'ndbds'}});
@@ -3884,12 +3885,12 @@ sub run_testcase_stop_servers($$$) {
     delete $slave->[0]->{'running_slave_options'}; # Forget history
 
     # Slave mysqld's
-    My::SafeProcess::shutdown( shutdown_timeout(),
+    My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started(@{$slave}) );
 
     # Slave cluster
     my $cluster= $clusters->[1];
-    My::SafeProcess::shutdown( shutdown_timeout(),
+    My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started($cluster, @{$cluster->{'ndbds'}}) );
 
     # Mark servers as stopped