diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2015-12-30 20:56:52 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2015-12-30 20:56:52 +0100 |
| commit | 56e0de0411315d348290aa257fce45cde9b22861 (patch) | |
| tree | b72bda089f3118125805eb2c2aa18a3576b74d16 | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| parent | ae7b39a13a312d9787a4895874f641e2dfe3adca (diff) | |
| download | mariadb-git-56e0de0411315d348290aa257fce45cde9b22861.tar.gz | |
Merge branch '10.0' into 10.1
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 87a14481e25..dca2faded71 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -357,14 +357,14 @@ int main(int argc, const char** argv ) CloseHandle(job_handle); message("Job terminated and closed"); - if (!jobobject_assigned) - { - GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, process_info.dwProcessId); - TerminateProcess(process_info.hProcess, 202); - } + if (wait_res != WAIT_OBJECT_0 + CHILD) { + if (!jobobject_assigned) + { + TerminateProcess(process_info.hProcess, 202); + } /* The child has not yet returned, wait for it */ message("waiting for child to exit"); if ((wait_res= WaitForSingleObject(wait_handles[CHILD], INFINITE)) |