summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help,win.rdiff
blob: b71401bf461f31bd03cb4dd7e136f59e9c98b2e1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
--- mysqld--help.result
+++ mysqld--help,win.reject
@@ -337,7 +337,6 @@ The following specify which files/extra groups are read (specified before remain
  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
@@ -537,6 +536,7 @@ The following specify which files/extra groups are read (specified before remain
  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=# 
@@ -928,6 +928,9 @@ The following specify which files/extra groups are read (specified before remain
  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.
@@ -1038,6 +1041,10 @@ The following specify which files/extra groups are read (specified before remain
  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
@@ -1056,6 +1063,7 @@ The following specify which files/extra groups are read (specified before remain
  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.
@@ -1092,25 +1100,11 @@ The following specify which files/extra groups are read (specified before remain
  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
@@ -1119,8 +1113,8 @@ The following specify which files/extra groups are read (specified before remain
  size, MariaDB 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
@@ -1244,7 +1238,6 @@ key-cache-block-size 1024
 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
@@ -1310,6 +1303,7 @@ myisam-sort-buffer-size 134216704
 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
@@ -1406,6 +1400,8 @@ safe-user-create FALSE
 secure-auth TRUE
 secure-file-priv (No default value)
 server-id 0
+shared-memory FALSE
+shared-memory-base-name MYSQL
 show-slave-auth-info FALSE
 silent-startup FALSE
 skip-grant-tables TRUE
@@ -1429,6 +1425,7 @@ slave-transaction-retries 10
 slave-type-conversions 
 slow-launch-time 2
 slow-query-log FALSE
+slow-start-timeout 15000
 sort-buffer-size 2097152
 sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 stack-trace TRUE
@@ -1444,10 +1441,8 @@ sysdate-is-now FALSE
 table-definition-cache 400
 tc-heuristic-recover OFF
 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 299008
 time-format %H:%i:%s
 timed-mutexes FALSE