Skip to content

Commit cd8482c

Browse files
author
Nirbhay Choubey
committed
MDEV-11945: Fix description for "max_statement_time" in --help
max_statement_time also applies to non-SELECT queries.
1 parent aa9db4c commit cd8482c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,10 @@ The following options may be given as the first argument:
467467
--max-sp-recursion-depth[=#]
468468
Maximum stored procedure recursion depth
469469
--max-statement-time=#
470-
A SELECT query that have taken more than
471-
max_statement_time seconds will be aborted. The argument
472-
will be treated as a decimal value with microsecond
473-
precision. A value of 0 (default) means no timeout
470+
A query that has taken more than max_statement_time
471+
seconds will be aborted. The argument will be treated as
472+
a decimal value with microsecond precision. A value of 0
473+
(default) means no timeout
474474
--max-tmp-tables=# Unused, will be removed.
475475
--max-user-connections=#
476476
The maximum number of active connections for a single

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
20462046
DEFAULT_VALUE 0.000000
20472047
VARIABLE_SCOPE SESSION
20482048
VARIABLE_TYPE DOUBLE
2049-
VARIABLE_COMMENT A SELECT query that have taken more than max_statement_time seconds will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout
2049+
VARIABLE_COMMENT A query that has taken more than max_statement_time seconds will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout
20502050
NUMERIC_MIN_VALUE 0
20512051
NUMERIC_MAX_VALUE 31536000
20522052
NUMERIC_BLOCK_SIZE NULL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2242,7 +2242,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
22422242
DEFAULT_VALUE 0.000000
22432243
VARIABLE_SCOPE SESSION
22442244
VARIABLE_TYPE DOUBLE
2245-
VARIABLE_COMMENT A SELECT query that have taken more than max_statement_time seconds will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout
2245+
VARIABLE_COMMENT A query that has taken more than max_statement_time seconds will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout
22462246
NUMERIC_MIN_VALUE 0
22472247
NUMERIC_MAX_VALUE 31536000
22482248
NUMERIC_BLOCK_SIZE NULL

sql/sys_vars.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,9 +1242,9 @@ static bool update_cached_max_statement_time(sys_var *self, THD *thd,
12421242

12431243
static Sys_var_double Sys_max_statement_time(
12441244
"max_statement_time",
1245-
"A SELECT query that have taken more than max_statement_time seconds "
1245+
"A query that has taken more than max_statement_time seconds "
12461246
"will be aborted. The argument will be treated as a decimal value "
1247-
"with microsecond precision. A value of 0 (default) means no timeout",
1247+
"with microsecond precision. A value of 0 (default) means no timeout",
12481248
SESSION_VAR(max_statement_time_double),
12491249
CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(0),
12501250
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),

0 commit comments

Comments
 (0)