From 913e79450fd8fb4fd254c680412b716358b6d965 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Fri, 13 Feb 2026 09:45:24 +0900 Subject: [PATCH 1/2] Patch wait_for_stop regardless of the driver --- t/lib/DodTestUtil.pm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/t/lib/DodTestUtil.pm b/t/lib/DodTestUtil.pm index 6f7c7db..ebd2a93 100755 --- a/t/lib/DodTestUtil.pm +++ b/t/lib/DodTestUtil.pm @@ -73,23 +73,21 @@ sub dsn { $dsn; }; } - if ($driver eq 'MySQL') { - *Test::mysqld::wait_for_stop = sub { - my $self = shift; - local $?; # waitpid may change this value :/ - my $ct = 0; - # XXX: modified - while (waitpid($self->pid, POSIX::WNOHANG()) <= 0) { - sleep 1; - if ($ct++ > 10) { - kill 9, $self->pid; - } + *Test::mysqld::wait_for_stop = sub { + my $self = shift; + local $?; # waitpid may change this value :/ + my $ct = 0; + # XXX: modified + while (waitpid($self->pid, POSIX::WNOHANG()) <= 0) { + sleep 1; + if ($ct++ > 10) { + kill 9, $self->pid; } - $self->pid(undef); - # might remain for example when sending SIGKILL - unlink $self->my_cnf->{'pid-file'}; - }; - } + } + $self->pid(undef); + # might remain for example when sending SIGKILL + unlink $self->my_cnf->{'pid-file'}; + }; $TestDB{$dbname} ||= Test::mysqld->new( my_cnf => { 'skip-networking' => '', # no TCP socket From d135061f3cdc0469da49c9a0c528101a6b994976 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Fri, 13 Feb 2026 09:52:05 +0900 Subject: [PATCH 2/2] Silence the redefine warning --- t/lib/DodTestUtil.pm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/t/lib/DodTestUtil.pm b/t/lib/DodTestUtil.pm index ebd2a93..87d6c3a 100755 --- a/t/lib/DodTestUtil.pm +++ b/t/lib/DodTestUtil.pm @@ -73,21 +73,24 @@ sub dsn { $dsn; }; } - *Test::mysqld::wait_for_stop = sub { - my $self = shift; - local $?; # waitpid may change this value :/ - my $ct = 0; - # XXX: modified - while (waitpid($self->pid, POSIX::WNOHANG()) <= 0) { - sleep 1; - if ($ct++ > 10) { - kill 9, $self->pid; + { + no warnings 'redefine'; + *Test::mysqld::wait_for_stop = sub { + my $self = shift; + local $?; # waitpid may change this value :/ + my $ct = 0; + # XXX: modified + while (waitpid($self->pid, POSIX::WNOHANG()) <= 0) { + sleep 1; + if ($ct++ > 10) { + kill 9, $self->pid; + } } - } - $self->pid(undef); - # might remain for example when sending SIGKILL - unlink $self->my_cnf->{'pid-file'}; - }; + $self->pid(undef); + # might remain for example when sending SIGKILL + unlink $self->my_cnf->{'pid-file'}; + }; + } $TestDB{$dbname} ||= Test::mysqld->new( my_cnf => { 'skip-networking' => '', # no TCP socket