mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
@ -1666,7 +1666,7 @@ sub kill_running_server () {
|
||||
{
|
||||
# Ensure that no old mysqld test servers are running
|
||||
# This is different from terminating processes we have
|
||||
# started from ths run of the script, this is terminating
|
||||
# started from this run of the script, this is terminating
|
||||
# leftovers from previous runs.
|
||||
|
||||
mtr_report("Killing Possible Leftover Processes");
|
||||
@ -3421,7 +3421,6 @@ sub run_testcase_stop_servers($$$) {
|
||||
my %admin_pids; # hash of admin processes that requests shutdown
|
||||
my @kill_pids; # list of processes to shutdown/kill
|
||||
|
||||
|
||||
# Remember if we restarted for this test case
|
||||
$tinfo->{'restarted'}= $do_restart;
|
||||
|
||||
|
Reference in New Issue
Block a user