From 0906ae77415ceb4388a5bc73c7fe91d72ca6a646 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Tue, 13 Dec 2011 17:44:19 +0200
Subject: [PATCH] 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).
---
 sql/mysqld.cc   | 18 ++++++++++++++++++
 sql/nt_servc.cc |  8 +++++++-
 sql/nt_servc.h  | 10 ++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7363128ec04..6afc20141e1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -368,6 +368,9 @@ my_bool locked_in_memory;
 bool opt_using_transactions;
 bool volatile abort_loop;
 bool volatile shutdown_in_progress;
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+ulong slow_start_timeout;
+#endif
 /*
   True if the bootstrap thread is running. Protected by LOCK_thread_count,
   just like thread_count.
@@ -4369,6 +4372,14 @@ int mysqld_main(int argc, char **argv)
 #endif
   }
 
+  /* 
+   The subsequent calls may take a long time : e.g. innodb log read.
+   Thus set the long running service control manager timeout
+  */
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+  Service.SetSlowStarting(slow_start_timeout);
+#endif
+
   if (init_server_components())
     unireg_abort(1);
 
@@ -5883,6 +5894,13 @@ struct my_option my_long_options[]=
    "Don't give threads different priorities. This option is deprecated "
    "because it has no effect; the implied behavior is already the default.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+  {"slow-start-timeout", 0,
+   "Maximum number of milliseconds that the service control manager should wait "
+   "before trying to kill the windows service during startup"
+   "(Default: 15000).", &slow_start_timeout, &slow_start_timeout, 0,
+   GET_ULONG, REQUIRED_ARG, 15000, 0, 0, 0, 0, 0},
+#endif
 #ifdef HAVE_REPLICATION
   {"sporadic-binlog-dump-fail", 0,
    "Option used by mysql-test for debugging and testing of replication.",
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);
 }
 
 
diff --git a/sql/nt_servc.h b/sql/nt_servc.h
index 5bee42dedf0..949499d8d7f 100644
--- a/sql/nt_servc.h
+++ b/sql/nt_servc.h
@@ -71,6 +71,16 @@ class NTService
     */
     void SetRunning(void);
 
+    /**
+      Sets a timeout after which SCM will abort service startup if SetRunning()
+      was not called or the timeout was not extended with another call to
+      SetSlowStarting(). Should be called when static initialization completes,
+      and the variable initialization part begins
+
+      @arg timeout  the timeout to pass to the SCM (in milliseconds)
+    */
+    void SetSlowStarting(unsigned long timeout);
+
     /*
       Stop() is to be called by the application to stop 
       the service