--- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -647,6 +646,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=# @@ -1236,6 +1236,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 @@ -1260,6 +1264,7 @@ deleting or updating every row in a table. --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). --standard-compliant-cte Allow only CTEs compliant to SQL standard (Defaults to on; use --skip-standard-compliant-cte to disable.) @@ -1330,6 +1335,11 @@ --thread-pool-max-threads=# Maximum allowed number of worker threads in the thread pool + --thread-pool-min-threads=# + Minimum number of threads in the thread pool. + --thread-pool-mode=name + Chose implementation of the threadpool. One of: windows, + generic --thread-pool-oversubscribe=# How many additional active worker threads in a group are allowed. @@ -1370,8 +1380,8 @@ 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 @@ -1587,6 +1596,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 @@ -1726,6 +1736,7 @@ slave-type-conversions slow-launch-time 2 slow-query-log FALSE +slow-start-timeout 15000 sort-buffer-size 2097152 sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION sql-safe-updates FALSE @@ -1753,6 +1764,8 @@ thread-cache-size 151 thread-pool-idle-timeout 60 thread-pool-max-threads 65536 +thread-pool-min-threads 1 +thread-pool-mode windows thread-pool-oversubscribe 3 thread-pool-prio-kickup-timer 1000 thread-pool-priority auto