diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-30 14:49:44 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-31 12:28:09 -0500 |
| commit | cd8482c19e325355006adc8fc5591998be46e288 (patch) | |
| tree | 20e2125ffbf72e978559360b437a696d860f718d /mysql-test/r/mysqld--help.result | |
| parent | aa9db4c162e9fa7560abb1bf8012233f30980e04 (diff) | |
| download | mariadb-git-cd8482c19e325355006adc8fc5591998be46e288.tar.gz | |
MDEV-11945: Fix description for "max_statement_time" in --help
max_statement_time also applies to non-SELECT queries.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 340fa21f0df..4b9370f2cd4 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -467,10 +467,10 @@ The following options may be given as the first argument: --max-sp-recursion-depth[=#] Maximum stored procedure recursion depth --max-statement-time=# - 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 + 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 --max-tmp-tables=# Unused, will be removed. --max-user-connections=# The maximum number of active connections for a single |