diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-10 15:51:40 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-10 15:51:40 -0700 |
| commit | 2f9555c40f96a956184a97e99d1b8f4cafbab024 (patch) | |
| tree | 720fa733cd37f94d1294d1e91b52cd0f285319c6 /mysql-test/r/mysqld--help.result | |
| parent | e20e28bd2eca6bb4961a298c2765885155bfdd57 (diff) | |
| download | mariadb-git-2f9555c40f96a956184a97e99d1b8f4cafbab024.tar.gz | |
Removed the parameter from st_select_lex_unit::exec_recursive.
Moved checking whether the limit set for the number of iterations
when executing a recursive query has been reached from
st_select_lex_unit::exec_recursive to TABLE_LIST::fill_recursive.
Changed the name of the system variable max_recursion_level for
max_recursive_iterations.
Adjusted test cases.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 9717b358f13..38075ef8520 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -450,7 +450,7 @@ The following options may be given as the first argument: max_allowed_packet instead. --max-prepared-stmt-count=# Maximum number of prepared statements in the server - --max-recursion-level[=#] + --max-recursive-iterations[=#] Maximum number of iterations when executing recursive queries --max-relay-log-size=# @@ -1273,7 +1273,7 @@ max-join-size 18446744073709551615 max-length-for-sort-data 1024 max-long-data-size 4194304 max-prepared-stmt-count 16382 -max-recursion-level 18446744073709551615 +max-recursive-iterations 18446744073709551615 max-relay-log-size 1073741824 max-seeks-for-key 18446744073709551615 max-sort-length 1024 |