Commit 4e599048 authored by unknown's avatar unknown

Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

parent dfbb36c5
...@@ -359,7 +359,7 @@ sub mtr_kill_leftovers () { ...@@ -359,7 +359,7 @@ sub mtr_kill_leftovers () {
"socket: '$srv->{path_sock}'; ". "socket: '$srv->{path_sock}'; ".
"port: $srv->{port})"); "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 # Save the pid of the mysqladmin process
$admin_pids{$pid}= 1; $admin_pids{$pid}= 1;
......
...@@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) { ...@@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) {
{ {
if ( $mysqld->{'pid'} ) if ( $mysqld->{'pid'} )
{ {
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70); $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
$admin_pids{$pid}= 1; $admin_pids{$pid}= 1;
...@@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) { ...@@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) {
{ {
if ( $mysqld->{'pid'} ) if ( $mysqld->{'pid'} )
{ {
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70); $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
$admin_pids{$pid}= 1; $admin_pids{$pid}= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment