summaryrefslogtreecommitdiff
path: root/sql/nt_servc.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-12-13 17:44:19 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-12-13 17:44:19 +0200
commita64a25baf9dd9ecff571bbab7a0dcb860eb06d24 (patch)
tree33fe5e170c6002e20cadd4d1fed97374fb97a581 /sql/nt_servc.cc
parent76383243b2c46d12f08d7c3f50f55d235affbc5a (diff)
downloadmariadb-git-a64a25baf9dd9ecff571bbab7a0dcb860eb06d24.tar.gz
Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED.
Added a global read-only option slow-start-timeout to control the Windows service control manager's service start timeout, that was currently hard-coded to be 15 seconds. The default of the new option is 15 seconds. The timeout can also be set to 0 (to mean no timeout applicable).
Diffstat (limited to 'sql/nt_servc.cc')
-rw-r--r--sql/nt_servc.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc
index 1f1b7f0c20f..d6a8eac7ed5 100644
--- a/sql/nt_servc.cc
+++ b/sql/nt_servc.cc
@@ -276,7 +276,13 @@ error:
void NTService::SetRunning()
{
if (pService)
- pService->SetStatus(SERVICE_RUNNING,NO_ERROR, 0, 0, 0);
+ pService->SetStatus(SERVICE_RUNNING, NO_ERROR, 0, 0, 0);
+}
+
+void NTService::SetSlowStarting(unsigned long timeout)
+{
+ if (pService)
+ pService->SetStatus(SERVICE_START_PENDING,NO_ERROR, 0, 0, timeout);
}