mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.3' into bb-10.4-release

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-08-10 12:21:08 +02:00
commit 65e8506ca9
39 changed files with 312 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/lib/My/SafeProcess/safe_process.cc
View file

@ -140,13 +140,20 @@ void handle_core(pid_t pid __attribute__((unused))) {}
static int kill_child(bool was_killed)
{
int status= 0;
pid_t ret_pid= 0;
message("Killing child: %d", child_pid);
// Terminate whole process group
if (! was_killed)
kill(-child_pid, SIGKILL);
{
kill(-child_pid, SIGTERM);
sleep(10); // will be interrupted by SIGCHLD
if (!(ret_pid= waitpid(child_pid, &status, WNOHANG)))
kill(-child_pid, SIGKILL);
}
pid_t ret_pid= waitpid(child_pid, &status, 0);
if (!ret_pid)
ret_pid= waitpid(child_pid, &status, 0);
if (ret_pid == child_pid)
{
int exit_code= 1;