bk commit into 5.1 tree (msvensson:1.2527)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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-06-29 14:18:20+02:00, msvensson@pilot.(none) +2 -0
  Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

  mysql-test/lib/mtr_process.pl@stripped, 2007-06-29 14:18:18+02:00, msvensson@pilot.(none) +1 -1
    Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

  mysql-test/mysql-test-run.pl@stripped, 2007-06-29 14:18:18+02:00, msvensson@pilot.(none) +2 -2
    Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

diff -Nrup a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
--- a/mysql-test/lib/mtr_process.pl	2007-06-27 09:51:07 +02:00
+++ b/mysql-test/lib/mtr_process.pl	2007-06-29 14:18:18 +02:00
@@ -359,7 +359,7 @@ sub mtr_kill_leftovers () {
               "socket: '$srv->{path_sock}'; ".
               "port: $srv->{port})");
 
-    my $pid= mtr_mysqladmin_start($srv, "shutdown", 70);
+    my $pid= mtr_mysqladmin_start($srv, "shutdown", 20);
 
     # Save the pid of the mysqladmin process
     $admin_pids{$pid}= 1;
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-06-27 14:28:27 +02:00
+++ b/mysql-test/mysql-test-run.pl	2007-06-29 14:18:18 +02:00
@@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) {
     {
       if ( $mysqld->{'pid'} )
       {
-	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
+	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
 
 	$admin_pids{$pid}= 1;
 
@@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) {
     {
       if ( $mysqld->{'pid'} )
       {
-	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
+	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
 
 	$admin_pids{$pid}= 1;