summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <Miguel@light.local>2001-09-25 01:13:19 -0300
committerunknown <Miguel@light.local>2001-09-25 01:13:19 -0300
commit2b8c677a3266d64c4cab7efbf7ddf2773a474351 (patch)
treeb86b189a0d333cd85fde6acea849ee208fa7d26b /sql/mysqld.cc
parent53b3e373e014378f1ccb615bc475a60c75ca6332 (diff)
downloadmariadb-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/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
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