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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-02-10 17:01:45 +01:00
parent 3ae038b732 bc4686f0f4
commit 2195bb4e41
226 changed files with 11199 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,10 +474,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