diff options
| author | unknown <Miguel@light.local> | 2001-09-25 01:13:19 -0300 |
|---|---|---|
| committer | unknown <Miguel@light.local> | 2001-09-25 01:13:19 -0300 |
| commit | 2b8c677a3266d64c4cab7efbf7ddf2773a474351 (patch) | |
| tree | b86b189a0d333cd85fde6acea849ee208fa7d26b /sql/nt_servc.cc | |
| parent | 53b3e373e014378f1ccb615bc475a60c75ca6332 (diff) | |
| download | mariadb-git-2b8c677a3266d64c4cab7efbf7ddf2773a474351.tar.gz | |
Changes on NT service for a more faster stop of the service on Win2k
and free the main thread of the service.
sql/mysqld.cc:
Time out to permit the clean shutdown of the server
sql/nt_servc.cc:
Time out and free the main thread of the service.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/nt_servc.cc')
| -rw-r--r-- | sql/nt_servc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc index 5884300fe95..3a36f5740a9 100644 --- a/sql/nt_servc.cc +++ b/sql/nt_servc.cc @@ -246,7 +246,8 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv) WaitForSingleObject (pService->hExitEvent, INFINITE); // wait for thread to exit - WaitForSingleObject (pService->hThreadHandle, 30000); + if (WaitForSingleObject (pService->hThreadHandle, 1000)==WAIT_TIMEOUT) + CloseHandle(pService->hThreadHandle); pService->Exit(0); } |