mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
c6e8d66e59
Update.rdiff fle Also, introduce my_popen()/my_fgets() wrapper function for popen()/fgets() in mysqltest to workaround a popen() bug in Windows C runtime, mentioned in MDEV-9409 This workaround was used previously for "exec". From now on, it is also used are used also for "perl" snippets.
122 lines
4.1 KiB
Text
122 lines
4.1 KiB
Text
--- a/mysql-test/r/mysqld--help.result
|
|
+++ b/mysql-test/r/mysqld--help.result
|
|
@@ -334,7 +334,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
|
|
@@ -543,6 +542,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=#
|
|
@@ -957,6 +957,9 @@
|
|
characteristics (isolation level, read only/read
|
|
write,snapshot - but not any work done / data modified
|
|
within the transaction).
|
|
+ --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.
|
|
@@ -1069,6 +1072,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
|
|
@@ -1087,6 +1094,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).
|
|
--standard-compliant-cte
|
|
Allow only CTEs compliant to SQL standard
|
|
(Defaults to on; use --skip-standard-compliant-cte to disable.)
|
|
@@ -1135,6 +1143,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.
|
|
@@ -1173,8 +1186,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
|
|
@@ -1299,7 +1312,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
|
|
@@ -1369,6 +1381,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
|
|
@@ -1470,6 +1483,8 @@
|
|
session-track-state-change FALSE
|
|
session-track-system-variables
|
|
session-track-transaction-info OFF
|
|
+shared-memory FALSE
|
|
+shared-memory-base-name MYSQL
|
|
show-slave-auth-info FALSE
|
|
silent-startup FALSE
|
|
skip-grant-tables TRUE
|
|
@@ -1494,6 +1509,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
|
|
stack-trace TRUE
|
|
@@ -1507,14 +1523,16 @@
|
|
sync-relay-log 10000
|
|
sync-relay-log-info 10000
|
|
sysdate-is-now FALSE
|
|
-table-cache 431
|
|
+table-cache 2000
|
|
table-definition-cache 400
|
|
-table-open-cache 431
|
|
+table-open-cache 2000
|
|
table-open-cache-instances 8
|
|
tc-heuristic-recover OFF
|
|
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
|