diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2015-12-30 20:55:12 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2015-12-30 20:55:12 +0100 |
| commit | ae7b39a13a312d9787a4895874f641e2dfe3adca (patch) | |
| tree | f7f06e4c6eaa4311e83ac9305585e89e90ae3d15 /mysql-test/lib | |
| parent | 4d3bc2615253031cac67e72b93ab65e27977f199 (diff) | |
| parent | ff2482026996d007689f41d522fb4d8289143a6b (diff) | |
| download | mariadb-git-ae7b39a13a312d9787a4895874f641e2dfe3adca.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/lib')
| -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)) |