summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorGalina Shalygina <galina.shalygina@mariadb.com>2018-05-13 18:28:40 +0200
committerGalina Shalygina <galina.shalygina@mariadb.com>2018-05-13 18:28:40 +0200
commit72529181d45b33bc4e50fdaf98cf84962088a51d (patch)
tree7b76390212c523a1527a86b49c0e9c1adff5b80e /sql/sys_vars.cc
parenteaaf004cc194d1f1fc422ebbd986ae69fc854d1c (diff)
parent79a7641b40c7b12dda4a6e30e7688b2f796e6a98 (diff)
downloadmariadb-git-bb-10.4-mdev12387.tar.gz
Merge branch 'bb-10.3-mdev12387' into 10.4bb-10.4-mdev12387
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index d0c0662c0a0..0331343ccef 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -2472,6 +2472,7 @@ export const char *optimizer_switch_names[]=
"orderby_uses_equalities",
"condition_pushdown_for_derived",
"split_materialized",
+ "condition_pushdown_for_subquery",
"default",
NullS
};