diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-19 15:53:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-19 15:53:26 +0300 |
| commit | 854e8b189e422e2d2e61e66380a18b9f8e33646d (patch) | |
| tree | f86a9519b3b66140f5bc2c6bcb1a4cdea1b7469c | |
| parent | 660afb1e9c11d4fe1ba806557c60cda3f62b1be1 (diff) | |
| download | mariadb-git-854e8b189e422e2d2e61e66380a18b9f8e33646d.tar.gz | |
MDEV-28976 fixup: A better fix
do_shutdown_server(): After sending SIGKILL, invoke wait_until_dead().
Thanks to Sergei Golubchik for pointing out that the previous fix
does not actually work.
| -rw-r--r-- | client/mysqltest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9e9b122c5fe..e745f8a3d2f 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5191,9 +5191,10 @@ void do_shutdown_server(struct st_command *command) if (timeout) (void) my_kill(pid, SIGABRT); /* Give server a few seconds to die in all cases */ - if (wait_until_dead(pid, timeout < 5 ? 5 : timeout)) + if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout)) { (void) my_kill(pid, SIGKILL); + wait_until_dead(pid, 5); } } DBUG_VOID_RETURN; |