Skip to content

Commit 2fdbe15

Browse files
committed
Correct test output after variable comment change
1 parent c6e8d66 commit 2fdbe15

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@
12371237
VARIABLE_SCOPE GLOBAL
12381238
-VARIABLE_TYPE BIGINT UNSIGNED
12391239
+VARIABLE_TYPE INT UNSIGNED
1240-
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
1240+
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
12411241
NUMERIC_MIN_VALUE 0
12421242
NUMERIC_MAX_VALUE 4294967295
12431243
@@ -4346,7 +4346,7 @@

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4334,7 +4334,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL
43344334
VARIABLE_NAME OPEN_FILES_LIMIT
43354335
VARIABLE_SCOPE GLOBAL
43364336
VARIABLE_TYPE BIGINT UNSIGNED
4337-
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
4337+
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
43384338
NUMERIC_MIN_VALUE 0
43394339
NUMERIC_MAX_VALUE 4294967295
43404340
NUMERIC_BLOCK_SIZE 1

mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@
12911291
VARIABLE_SCOPE GLOBAL
12921292
-VARIABLE_TYPE BIGINT UNSIGNED
12931293
+VARIABLE_TYPE INT UNSIGNED
1294-
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
1294+
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
12951295
NUMERIC_MIN_VALUE 0
12961296
NUMERIC_MAX_VALUE 4294967295
12971297
@@ -5228,7 +5228,7 @@

0 commit comments

Comments
 (0)