diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-25 13:10:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-25 13:10:33 +0300 |
| commit | 818d5e48146b7938a7ccca4ccf819afe3ea8a005 (patch) | |
| tree | 3fd9c85866cc4cd504e316268b84582260fae180 /client | |
| parent | 0976afec889d8914326f9e71b15ea215470dadba (diff) | |
| parent | 50f3b7d1649002df3c73ec88827707096ce3135c (diff) | |
| download | mariadb-git-818d5e48146b7938a7ccca4ccf819afe3ea8a005.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 407733937e0..40a1c0158d2 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5212,6 +5212,7 @@ void do_shutdown_server(struct st_command *command) if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout)) { (void) my_kill(pid, SIGKILL); + wait_until_dead(pid, 5); } } DBUG_VOID_RETURN; |