diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-20 11:47:55 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-20 11:47:55 +0200 |
| commit | c5fb4b243a06fc097b390d867e042f00809b326d (patch) | |
| tree | dd1277b541075a3160d91f9659c7211e10f257bb /mysql-test/mysql-test-run.pl | |
| parent | 9cb0a84c7e475302350d64ffd33cb8e61a25737e (diff) | |
| download | mariadb-git-c5fb4b243a06fc097b390d867e042f00809b326d.tar.gz | |
Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step
- Improve shutdown algorithm
- Wait up to 5 seconds for processes to exit after their port is free
mysql-test/lib/mtr_process.pl:
Improve shutdown algorithm, shutdown the server hard
if it hasn't responded to "mysqladmin shutdown" and it's port is free.
Print error to servers error log indicating "hard shutdown"
Give processes up to 5 seconds to exit after their port is free
mysql-test/lib/mtr_report.pl:
Indicate in what file the warning was found
mysql-test/mysql-test-run.pl:
Pass path of process error log to 'mtr_check_stop_servers'
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2d665564034..103f7b309de 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4097,6 +4097,7 @@ sub stop_all_servers () { pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, + errfile => $mysqld->{'path_myerr'}, }); $mysqld->{'pid'}= 0; # Assume we are done with it @@ -4303,6 +4304,7 @@ sub run_testcase_stop_servers($$$) { pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, + errfile => $mysqld->{'path_myerr'}, }); $mysqld->{'pid'}= 0; # Assume we are done with it @@ -4353,6 +4355,7 @@ sub run_testcase_stop_servers($$$) { pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, + errfile => $mysqld->{'path_myerr'}, }); |