mariadb/mysql-test/r/mysqld--help,win.rdiff

--- mysqld--help.result	2014-11-26 11:47:49.151273200 +0400
+++ mysqld--help,win.reject	2014-11-26 12:57:09.108153400 +0400
@@ -288,7 +288,6 @@
  The number of segments in a key cache
  -L, --language=name Client error messages in given language. May be given as
  a full path. Deprecated. Use --lc-messages-dir instead.
- --large-pages       Enable support for large pages
  --lc-messages=name  Set the language used for the error messages.
  -L, --lc-messages-dir=name 
  Directory where error messages are
@@ -483,6 +482,7 @@
  Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
  DATETIME, TIMESTAMP columns.
  (Defaults to on; use --skip-mysql56-temporal-format to disable.)
+ --named-pipe        Enable the named pipe (NT)
  --net-buffer-length=# 
  Buffer length for TCP/IP and socket communication
  --net-read-timeout=# 
@@ -870,6 +870,9 @@
  files within specified directory
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
+ --shared-memory     Enable the shared memory
+ --shared-memory-base-name=name 
+ Base name of shared memory
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this
  master.
@@ -969,6 +972,10 @@
  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
@@ -987,6 +994,7 @@
  NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
  --stack-trace       Print a symbolic stack trace on failure
  (Defaults to on; use --skip-stack-trace to disable.)
+ --standalone        Dummy option to start as a standalone program (NT).
  --stored-program-cache=# 
  The soft upper limit for number of cached stored routines
  for one connection.
@@ -1019,25 +1027,11 @@
  COMMIT, ROLLBACK
  --thread-cache-size=# 
  How many threads we should keep in a cache for reuse
- --thread-pool-idle-timeout=# 
- Timeout in seconds for an idle thread in the thread
- pool.Worker thread will be shut down after timeout
  --thread-pool-max-threads=# 
  Maximum allowed number of worker threads in the thread
  pool
- --thread-pool-oversubscribe=# 
- How many additional active worker threads in a group are
- allowed.
- --thread-pool-size=# 
- Number of thread groups in the pool. This parameter is
- roughly equivalent to maximum number of concurrently
- executing threads (threads in a waiting state do not
- count as executing).
- --thread-pool-stall-limit=# 
- Maximum query execution time in milliseconds,before an
- executing non-yielding thread is considered stalled.If a
- worker thread is stalled, additional worker thread may be
- created to handle remaining clients.
+ --thread-pool-min-threads=# 
+ Minimum number of threads in the thread pool.
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
  --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
@@ -1046,8 +1040,8 @@
  size, MySQL will automatically convert it to an on-disk
  MyISAM or Aria table
  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
- separated by a colon (:), in this case they are used in a
- round-robin fashion
+ separated by a semicolon (;), in this case they are used
+ in a round-robin fashion
  --transaction-alloc-block-size=# 
  Allocation block size for transactions to be stored in
  binary log
@@ -1165,7 +1159,6 @@
 key-cache-division-limit 100
 key-cache-file-hash-size 512
 key-cache-segments 0
-large-pages FALSE
 lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
@@ -1231,6 +1224,7 @@
 myisam-stats-method NULLS_UNEQUAL
 myisam-use-mmap FALSE
 mysql56-temporal-format TRUE
+named-pipe FALSE
 net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10
@@ -1327,6 +1321,8 @@
 secure-auth FALSE
 secure-file-priv (No default value)
 server-id 0
+shared-memory FALSE
+shared-memory-base-name MYSQL
 show-slave-auth-info FALSE
 skip-grant-tables TRUE
 skip-name-resolve FALSE
@@ -1348,6 +1344,7 @@
 slave-type-conversions 
 slow-launch-time 2
 slow-query-log FALSE
+slow-start-timeout 15000
 sort-buffer-size 2097152
 sql-mode 
 stack-trace TRUE
@@ -1364,10 +1361,8 @@
 table-open-cache 400
 tc-heuristic-recover COMMIT
 thread-cache-size 0
-thread-pool-idle-timeout 60
 thread-pool-max-threads 1000
-thread-pool-oversubscribe 3
-thread-pool-stall-limit 500
+thread-pool-min-threads 1
 thread-stack 294912
 time-format %H:%i:%s
 timed-mutexes FALSE