From 596aca33f537ec5a1c0c2bf37365775938fe1b70 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Mon, 14 Apr 2008 14:25:57 +0200
Subject: [PATCH] Set mysqladmin shutdown timeout to 60 seconds

---
 mysql-test/include/restart_mysqld.inc | 2 +-
 mysql-test/mysql-test-run.pl          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc
index 6bd95c80b60..106563d287d 100644
--- a/mysql-test/include/restart_mysqld.inc
+++ b/mysql-test/include/restart_mysqld.inc
@@ -2,7 +2,7 @@
 # Write file to make mysql-test-run.pl expect crash and restart
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown
+--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf --shutdown-timeout=60 shutdown
 
 # Call script that will poll the server waiting for it to be gone
 --source include/wait_until_disconnected.inc
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ebd21090a76..86da2219807 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2633,7 +2633,7 @@ sub check_expected_crash_and_restart {
     my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect";
     if ( -f $expect_file )
     {
-      mtr_verbose("Crash was expected, file $expect_file exists");
+      mtr_report("Crash was expected, file '$expect_file' exists");
       # Start server with same settings as last time
       mysqld_start($mysqld, $mysqld->{'started_opts'});
       unlink($expect_file);