Skip to content

Commit fbef428

Browse files
committed
MDEV-22137 correct documentation of tcp_keepalive_time system variable
1 parent 0932c58 commit fbef428

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

mysql-test/main/mysqld--help.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,10 +1273,10 @@ The following specify which files/extra groups are read (specified before remain
12731273
application layer.If set to 0, system dependent default
12741274
is used. (Automatically configured unless set explicitly)
12751275
--tcp-keepalive-time=#
1276-
Timeout, in milliseconds, with no activity until the
1277-
first TCP keep-alive packet is sent.If set to 0, system
1278-
dependent default is used. (Automatically configured
1279-
unless set explicitly)
1276+
Timeout, in seconds, with no activity until the first TCP
1277+
keep-alive packet is sent.If set to 0, system dependent
1278+
default is used. (Automatically configured unless set
1279+
explicitly)
12801280
--thread-cache-size=#
12811281
How many threads we should keep in a cache for reuse.
12821282
These are freed after 5 minutes of idle time

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3335,7 +3335,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
33353335
VARIABLE_NAME TCP_KEEPALIVE_TIME
33363336
VARIABLE_SCOPE GLOBAL
33373337
VARIABLE_TYPE INT
3338-
VARIABLE_COMMENT Timeout, in milliseconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used.
3338+
VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used.
33393339
NUMERIC_MIN_VALUE 0
33403340
NUMERIC_MAX_VALUE 2147483
33413341
NUMERIC_BLOCK_SIZE 1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4015,7 +4015,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
40154015
VARIABLE_NAME TCP_KEEPALIVE_TIME
40164016
VARIABLE_SCOPE GLOBAL
40174017
VARIABLE_TYPE INT
4018-
VARIABLE_COMMENT Timeout, in milliseconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used.
4018+
VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used.
40194019
NUMERIC_MIN_VALUE 0
40204020
NUMERIC_MAX_VALUE 2147483
40214021
NUMERIC_BLOCK_SIZE 1

sql/sys_vars.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5679,7 +5679,7 @@ vio_keepalive_opts opt_vio_keepalive;
56795679

56805680
static Sys_var_int Sys_keepalive_time(
56815681
"tcp_keepalive_time",
5682-
"Timeout, in milliseconds, with no activity until the first TCP keep-alive packet is sent."
5682+
"Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent."
56835683
"If set to 0, system dependent default is used.",
56845684
AUTO_SET GLOBAL_VAR(opt_vio_keepalive.idle),
56855685
CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000),

0 commit comments

Comments
 (0)