Commit 2b05ef11 authored by Georgi Kodinov's avatar Georgi Kodinov

Addendum to the fix for bug #11754011: fixed a testcase result to include

the new --slow-start-timeout option's help output
parent a64a25ba
...@@ -665,6 +665,10 @@ The following options may be given as the first argument: ...@@ -665,6 +665,10 @@ The following options may be given as the first argument:
Log slow queries to given log file. Defaults logging to Log slow queries to given log file. Defaults logging to
hostname-slow.log. Must be enabled to activate other slow hostname-slow.log. Must be enabled to activate other slow
log options 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 --socket=name Socket file to use for connection
--sort-buffer-size=# --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of Each thread that needs to do a sort allocates a buffer of
...@@ -938,6 +942,7 @@ slave-transaction-retries 10 ...@@ -938,6 +942,7 @@ slave-transaction-retries 10
slave-type-conversions slave-type-conversions
slow-launch-time 2 slow-launch-time 2
slow-query-log FALSE slow-query-log FALSE
slow-start-timeout 15000
sort-buffer-size 2097152 sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE sporadic-binlog-dump-fail FALSE
sql-mode sql-mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment