From 2b05ef11fcc5d0781553944ea85f28b2857f7bbc Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Wed, 14 Dec 2011 12:49:32 +0200
Subject: [PATCH] Addendum to the fix for bug #11754011: fixed a testcase
 result to include the new --slow-start-timeout option's help output

---
 mysql-test/r/mysqld--help-win.result | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index 38235e1a093..2ef52355f90 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -665,6 +665,10 @@ The following options may be given as the first argument:
  Log slow queries to given log file. Defaults logging to
  hostname-slow.log. Must be enabled to activate other slow
  log options
+ --slow-start-timeout=# 
+ Maximum number of milliseconds that the service control
+ manager should wait before trying to kill the windows
+ service during startup(Default: 15000).
  --socket=name       Socket file to use for connection
  --sort-buffer-size=# 
  Each thread that needs to do a sort allocates a buffer of
@@ -938,6 +942,7 @@ slave-transaction-retries 10
 slave-type-conversions 
 slow-launch-time 2
 slow-query-log FALSE
+slow-start-timeout 15000
 sort-buffer-size 2097152
 sporadic-binlog-dump-fail FALSE
 sql-mode