summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/sysvars_server_embedded,win.rdiff
blob: e99323110088f4fe5e3976b15299f30331966fb1 (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
--- suite/sys_vars/r/sysvars_server_embedded.result	2015-08-05 17:22:49.437267900 +0300
+++ suite/sys_vars/r/sysvars_server_embedded.reject	2015-08-05 17:51:37.881752500 +0300
@@ -1021,7 +1021,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
@@ -1429,7 +1429,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
@@ -1438,7 +1438,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
@@ -1537,20 +1537,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
@@ -2223,6 +2209,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
@@ -3868,7 +3868,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
@@ -4010,7 +4010,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