summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorGalina Shalygina <galashalygina@gmail.com>2016-05-24 21:29:52 +0300
committerGalina Shalygina <galashalygina@gmail.com>2016-05-24 21:29:52 +0300
commitb4f1f42062d108230b62ad49fedd93ee6e38e168 (patch)
treea57f64c4f64bed0e7b14fca9ea10ddbaf7f7d702 /mysql-test/r/mysqld--help.result
parent0f7fe2a7437e69d1973d4354c2cddd7beeca05b9 (diff)
downloadmariadb-git-b4f1f42062d108230b62ad49fedd93ee6e38e168.tar.gz
Fixed the problem of wrong identification of WITH tables defined in WITH clauses without RECURSIVE.
Added test cases to check the fix. Fixed the problem of wrong types of recursive tables when the type of anchor part does not coincide with the type of recursive part. Prevented usage of marerialization and subquery cache for subqueries with recursive references. Introduced system variables 'max_recursion_level'. Added a test case to test usage of this variable.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 7a8b9dc3df4..9d986c54a9d 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -450,6 +450,9 @@ 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[=#]
+ Maximum number of iterations when executing recursive
+ queries
--max-relay-log-size=#
relay log will be rotated automatically when the size
exceeds this value. If 0 at startup, it's set to
@@ -1270,6 +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-relay-log-size 1073741824
max-seeks-for-key 18446744073709551615
max-sort-length 1024