Changes on NT service for a more faster stop of the service on Win2k

and free the main thread of the service.

3 files changed, 4 insertions, 23 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 390c414d29c..efa9faefd05 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,21 +1 @@
-davida@isil.mysql.com
-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
+Miguel@light.local
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a124eea7807..435ee51a0e0 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2006,7 +2006,7 @@ The server will not act as a slave.");
   {
     if(start_mode)
     {
-      if (WaitForSingleObject(hEventShutdown,INFINITE)==WAIT_OBJECT_0)
+      if (WaitForSingleObject(hEventShutdown,1000)==WAIT_TIMEOUT)
         Service.Stop();
     }
     else
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);
 }