database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-22137 correct documentation of tcp_keepalive_time system variable

Browse Source
This commit is contained in:
Vladislav Vaintroub
2020-04-03 12:33:31 +02:00
parent 0932c5804d
commit fbef428645
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/mysqld--help.result
View File

@ -1273,10 +1273,10 @@ The following specify which files/extra groups are read (specified before remain
application layer.If set to 0, system dependent default application layer.If set to 0, system dependent default
is used. (Automatically configured unless set explicitly) is used. (Automatically configured unless set explicitly)
--tcp-keepalive-time=# --tcp-keepalive-time=#
Timeout, in milliseconds, with no activity until the Timeout, in seconds, with no activity until the first TCP
first TCP keep-alive packet is sent.If set to 0, system keep-alive packet is sent.If set to 0, system dependent
dependent default is used. (Automatically configured default is used. (Automatically configured unless set
unless set explicitly) explicitly)
--thread-cache-size=# --thread-cache-size=#
How many threads we should keep in a cache for reuse. How many threads we should keep in a cache for reuse.
These are freed after 5 minutes of idle time These are freed after 5 minutes of idle time

2
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@ -3335,7 +3335,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_NAME TCP_KEEPALIVE_TIME
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT VARIABLE_TYPE INT
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. 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.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2147483 NUMERIC_MAX_VALUE 2147483
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1

2
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -4015,7 +4015,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_NAME TCP_KEEPALIVE_TIME
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT VARIABLE_TYPE INT
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. 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.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2147483 NUMERIC_MAX_VALUE 2147483
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1

2
sql/sys_vars.cc
View File

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