mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
@ -4096,6 +4096,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
|
||||
@ -4302,6 +4303,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
|
||||
@ -4352,6 +4354,7 @@ sub run_testcase_stop_servers($$$) {
|
||||
pidfile => $mysqld->{'path_pid'},
|
||||
sockfile => $mysqld->{'path_sock'},
|
||||
port => $mysqld->{'port'},
|
||||
errfile => $mysqld->{'path_myerr'},
|
||||
});
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user