database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 22:59:58 +02:00
parent 77992bc710 1423cf5e3d
commit 7841a7eb09
339 changed files with 7425 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/lib/My/SafeProcess.pm
View File

@ -389,10 +389,10 @@ sub _collect {
# 1 Still running
#
sub wait_one {
my ($self, $timeout)= @_;
croak "usage: \$safe_proc->wait_one([timeout])" unless ref $self;
my ($self, $timeout, $keep)= @_;
croak "usage: \$safe_proc->wait_one([timeout] [, keep])" unless ref $self;
_verbose("wait_one $self, $timeout");
_verbose("wait_one $self, $timeout, $keep");
if ( ! defined($self->{SAFE_PID}) ) {
# No pid => not running
@ -466,16 +466,16 @@ sub wait_one {
return 1;
}
if ( not $blocking and $retpid == -1 ) {
# still running
_verbose("still running");
return 1;
}
#if ( not $blocking and $retpid == -1 ) {
# # still running
# _verbose("still running");
# return 1;
#}
#warn "wait_one: expected pid $pid but got $retpid"
# unless( $retpid == $pid );
$self->_collect($exit_code);
$self->_collect($exit_code) unless $keep;
return 0;
}