Skip to content

Commit 7583d91

Browse files
committed
Bug#21021754 - OPTION FOR MAX_STATEMENT_TIME IS MISSING
Issues here is, option to set max_statement_time from server command line is missing. Modified code to set max_statement_time from command line.
1 parent c4a51b2 commit 7583d91

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,9 @@ The following options may be given as the first argument:
519519
value are used; the rest are ignored)
520520
--max-sp-recursion-depth[=#]
521521
Maximum stored procedure recursion depth
522+
--max-statement-time=#
523+
Kill SELECT statement that takes over the specified
524+
number of milliseconds
522525
--max-tmp-tables=# Maximum number of temporary tables a client can keep open
523526
at a time
524527
--max-user-connections=#
@@ -1332,6 +1335,7 @@ max-relay-log-size 0
13321335
max-seeks-for-key 18446744073709551615
13331336
max-sort-length 1024
13341337
max-sp-recursion-depth 0
1338+
max-statement-time 0
13351339
max-tmp-tables 32
13361340
max-user-connections 0
13371341
max-write-lock-count 18446744073709551615

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ The following options may be given as the first argument:
509509
value are used; the rest are ignored)
510510
--max-sp-recursion-depth[=#]
511511
Maximum stored procedure recursion depth
512+
--max-statement-time=#
513+
Kill SELECT statement that takes over the specified
514+
number of milliseconds
512515
--max-tmp-tables=# Maximum number of temporary tables a client can keep open
513516
at a time
514517
--max-user-connections=#
@@ -1327,6 +1330,7 @@ max-relay-log-size 0
13271330
max-seeks-for-key 18446744073709551615
13281331
max-sort-length 1024
13291332
max-sp-recursion-depth 0
1333+
max-statement-time 0
13301334
max-tmp-tables 32
13311335
max-user-connections 0
13321336
max-write-lock-count 18446744073709551615

sql/sys_vars.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3492,7 +3492,7 @@ static Sys_var_set Sys_sql_mode(
34923492
static Sys_var_ulong Sys_max_statement_time(
34933493
"max_statement_time",
34943494
"Kill SELECT statement that takes over the specified number of milliseconds",
3495-
SESSION_VAR(max_statement_time), NO_CMD_LINE,
3495+
SESSION_VAR(max_statement_time), CMD_LINE(REQUIRED_ARG),
34963496
VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
34973497

34983498
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)

0 commit comments

Comments
 (0)