summaryrefslogtreecommitdiff
path: root/sql/nt_servc.cc
diff options
context:
space:
mode:
authorunknown <miguel@light.local>2002-02-20 23:20:15 -0300
committerunknown <miguel@light.local>2002-02-20 23:20:15 -0300
commit8f61f5475ce29042c0ec30f5d130ab63768d4326 (patch)
tree834b74e42590215d9e9024027fe504361ef3d7b7 /sql/nt_servc.cc
parentdc09f16694edd1075668c57a8f4cee950edae41f (diff)
downloadmariadb-git-8f61f5475ce29042c0ec30f5d130ab63768d4326.tar.gz
Changes for to control the tables and log clean up.
sql/mysqld.cc: Added Monty's code for to call the handler of named pipes at shutdown. Change the code to call the stop service after the clean up. Change the create/open the mysql.err files for to print the InnoDB start messages. sql/nt_servc.cc: Modify the WaitHint for to kill the service. This will be modify for to be defined through an user variable.
Diffstat (limited to 'sql/nt_servc.cc')
-rw-r--r--sql/nt_servc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc
index 6930800982e..8c705a94f55 100644
--- a/sql/nt_servc.cc
+++ b/sql/nt_servc.cc
@@ -28,7 +28,7 @@ NTService::NTService()
//time-out variables
nStartTimeOut = 15000;
- nStopTimeOut = 15000;
+ nStopTimeOut = 86400000;
nPauseTimeOut = 5000;
nResumeTimeOut = 5000;
@@ -253,7 +253,7 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv)
WaitForSingleObject (pService->hExitEvent, INFINITE);
// wait for thread to exit
- if (WaitForSingleObject (pService->hThreadHandle, 1000) == WAIT_TIMEOUT)
+ if (WaitForSingleObject (pService->hThreadHandle, INFINITE) == WAIT_TIMEOUT)
CloseHandle(pService->hThreadHandle);
pService->Exit(0);