mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Vladislav Vaintroub 2015-12-30 20:56:52 +01:00
commit 56e0de0411
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/lib/My/SafeProcess/safe_process_win.cc
View file

@ -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))