Commit 2b8c677a authored by unknown's avatar unknown

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
parent 53b3e373
davida@isil.mysql.com Miguel@light.local
heikki@donna.mysql.fi
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
jcole@tetra.spaceapes.com
miguel@light.local
monty@bitch.mysql.fi
monty@hundin.mysql.fi
monty@tik.mysql.fi
monty@work.mysql.com
mwagner@evoq.mwagner.org
paul@central.snake.net
paul@teton.kitebird.com
sasha@mysql.sashanet.com
serg@serg.mysql.com
tim@bitch.mysql.fi
tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com
tonu@x153.internalnet
tfr@sarvik.tfr.cafe.ee
...@@ -2006,7 +2006,7 @@ The server will not act as a slave."); ...@@ -2006,7 +2006,7 @@ The server will not act as a slave.");
{ {
if(start_mode) if(start_mode)
{ {
if (WaitForSingleObject(hEventShutdown,INFINITE)==WAIT_OBJECT_0) if (WaitForSingleObject(hEventShutdown,1000)==WAIT_TIMEOUT)
Service.Stop(); Service.Stop();
} }
else else
......
...@@ -246,7 +246,8 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv) ...@@ -246,7 +246,8 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv)
WaitForSingleObject (pService->hExitEvent, INFINITE); WaitForSingleObject (pService->hExitEvent, INFINITE);
// wait for thread to exit // wait for thread to exit
WaitForSingleObject (pService->hThreadHandle, 30000); if (WaitForSingleObject (pService->hThreadHandle, 1000)==WAIT_TIMEOUT)
CloseHandle(pService->hThreadHandle);
pService->Exit(0); pService->Exit(0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment