summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff
blob: eee9d132c61a458a2c85cdfa059d6c7642403d9f (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
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
--- suite/sys_vars/r/sysvars_server_notembedded.result	2015-08-05 17:03:53.564530400 +0300
+++ suite/sys_vars/r/sysvars_server_notembedded.reject	2015-08-05 17:05:24.952635200 +0300
@@ -1133,7 +1133,7 @@
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	HAVE_CRYPT
 SESSION_VALUE	NULL
-GLOBAL_VALUE	YES
+GLOBAL_VALUE	NO
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
@@ -1541,7 +1541,7 @@
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Enable support for large pages
@@ -1550,7 +1550,7 @@
 NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	YES
-COMMAND_LINE_ARGUMENT	OPTIONAL
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LARGE_PAGE_SIZE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	0
@@ -1663,20 +1663,6 @@
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
-VARIABLE_NAME	LOCKED_IN_MEMORY
-SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	NULL
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Whether mysqld was locked in memory with --memlock
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	YES
-COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LOCK_WAIT_TIMEOUT
 SESSION_VALUE	31536000
 GLOBAL_VALUE	31536000
@@ -2419,6 +2405,20 @@
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	NAMED_PIPE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Enable the named pipe (NT)
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	NET_BUFFER_LENGTH
 SESSION_VALUE	16384
 GLOBAL_VALUE	16384
@@ -3679,6 +3679,34 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SHARED_MEMORY
+SESSION_VALUE	NULL
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Enable the shared memory
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	SHARED_MEMORY_BASE_NAME
+SESSION_VALUE	NULL
+GLOBAL_VALUE	PATH
+GLOBAL_VALUE_ORIGIN	CONFIG
+DEFAULT_VALUE	
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	Base name of shared memory
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	SKIP_EXTERNAL_LOCKING
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON
@@ -4479,9 +4507,9 @@
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_HANDLING
 SESSION_VALUE	NULL
-GLOBAL_VALUE	one-thread-per-connection
+GLOBAL_VALUE	pool-of-threads
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	one-thread-per-connection
+DEFAULT_VALUE	pool-of-threads
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
 VARIABLE_COMMENT	Define threads usage for handling queries
@@ -4491,20 +4519,6 @@
 ENUM_VALUE_LIST	one-thread-per-connection,no-threads,pool-of-threads
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	THREAD_POOL_IDLE_TIMEOUT
-SESSION_VALUE	NULL
-GLOBAL_VALUE	60
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	60
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
-VARIABLE_COMMENT	Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout
-NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_POOL_MAX_THREADS
 SESSION_VALUE	NULL
 GLOBAL_VALUE	1000
@@ -4519,44 +4533,16 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	THREAD_POOL_OVERSUBSCRIBE
+VARIABLE_NAME	THREAD_POOL_MIN_THREADS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	3
+GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	3
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
-VARIABLE_COMMENT	How many additional active worker threads in a group are allowed.
-NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	1000
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	THREAD_POOL_SIZE
-SESSION_VALUE	NULL
-GLOBAL_VALUE	4
-GLOBAL_VALUE_ORIGIN	CONFIG
-DEFAULT_VALUE	8
+DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
-VARIABLE_COMMENT	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).
+VARIABLE_COMMENT	Minimum number of threads in the thread pool.
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	100000
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	THREAD_POOL_STALL_LIMIT
-SESSION_VALUE	NULL
-GLOBAL_VALUE	500
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	500
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
-VARIABLE_COMMENT	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.
-NUMERIC_MIN_VALUE	10
-NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+NUMERIC_MAX_VALUE	256
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4638,7 +4624,7 @@
 DEFAULT_VALUE	
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a colon (:), in this case they are used in a round-robin fashion
+VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a semicolon (;), in this case they are used in a round-robin fashion
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@@ -4780,7 +4766,7 @@
 VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	31536000
+NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO