1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-11945: Fix description for "max_statement_time" in --help

Browse Source 
max_statement_time also applies to non-SELECT queries.
This commit is contained in:
Nirbhay Choubey 2017-01-30 14:49:44 -05:00
parent aa9db4c162
commit cd8482c19e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,10 +467,10 @@ The following options may be given as the first argument:
--max-sp-recursion-depth[=#] --max-sp-recursion-depth[=#]
Maximum stored procedure recursion depth Maximum stored procedure recursion depth
--max-statement-time=# --max-statement-time=#
A SELECT query that have taken more than A query that has taken more than max_statement_time
max_statement_time seconds will be aborted. The argument seconds will be aborted. The argument will be treated as
will be treated as a decimal value with microsecond a decimal value with microsecond precision. A value of 0
precision. A value of 0 (default) means no timeout (default) means no timeout
--max-tmp-tables=# Unused, will be removed. --max-tmp-tables=# Unused, will be removed.
--max-user-connections=# --max-user-connections=#
The maximum number of active connections for a single The maximum number of active connections for a single

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

@ -2046,7 +2046,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0.000000 DEFAULT_VALUE 0.000000
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE DOUBLE VARIABLE_TYPE DOUBLE
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 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
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL

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

@ -2242,7 +2242,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0.000000 DEFAULT_VALUE 0.000000
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE DOUBLE VARIABLE_TYPE DOUBLE
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 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
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL

4
sql/sys_vars.cc
View File

@ -1242,9 +1242,9 @@ static bool update_cached_max_statement_time(sys_var *self, THD *thd,
static Sys_var_double Sys_max_statement_time( static Sys_var_double Sys_max_statement_time(
"max_statement_time", "max_statement_time",
"A SELECT query that have taken more than max_statement_time seconds " "A query that has taken more than max_statement_time seconds "
"will be aborted. The argument will be treated as a decimal value " "will be aborted. The argument will be treated as a decimal value "
"with microsecond precision. A value of 0 (default) means no timeout", "with microsecond precision. A value of 0 (default) means no timeout",
SESSION_VAR(max_statement_time_double), SESSION_VAR(max_statement_time_double),
CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(0), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(0),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),