summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-06-19 15:06:45 +0300
committerunknown <timour@askmonty.org>2012-06-19 15:06:45 +0300
commit0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (patch)
tree14476572c91530f3b354041e1683e2b042b9a9cd /sql/sys_vars.cc
parent37f8094652c438360b66aa04a46acb96d3eea6b7 (diff)
parentcf3a499f541e66e1b8aa96fe16e36a48ed1c0a0e (diff)
downloadmariadb-git-0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211.tar.gz
Merged the fix for bug lp:944706, mdev-193
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index bbe6d45b533..e1cadb52648 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -3768,4 +3768,9 @@ static Sys_var_ulong Sys_debug_binlog_fsync_sleep(
CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1));
#endif
-
+static Sys_var_harows Sys_expensive_subquery_limit(
+ "expensive_subquery_limit",
+ "The maximum number of rows a subquery may examine in order to be "
+ "executed during optimization and used for constant optimization",
+ SESSION_VAR(expensive_subquery_limit), CMD_LINE(REQUIRED_ARG),
+ VALID_RANGE(0, HA_POS_ERROR), DEFAULT(100), BLOCK_SIZE(1));