summaryrefslogtreecommitdiff
path: root/sql/opt_subselect.cc
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-11-21 17:48:25 +0200
committerunknown <timour@askmonty.org>2011-11-21 17:48:25 +0200
commite9a6502f261d927719762dab11aac8b2af50ff34 (patch)
tree7cd903159f2c7042631825d3dec6ea808698d3be /sql/opt_subselect.cc
parent0693f4d9168eeee399f9d636c9ba81981e484daf (diff)
parentf0d9908fc3582cf08db7e0376f0e243b1e754ad5 (diff)
downloadmariadb-git-e9a6502f261d927719762dab11aac8b2af50ff34.tar.gz
Merge enabling materialization=on by default.
Diffstat (limited to 'sql/opt_subselect.cc')
-rw-r--r--sql/opt_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index efaac11f53b..167d87ed850 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -447,7 +447,7 @@ int check_and_do_in_subquery_rewrites(JOIN *join)
subquery execution strategies based on optimizer switches and syntactic
properties.
*/
- if (in_subs)
+ if (in_subs && !in_subs->has_strategy())
{
if (is_materialization_applicable(thd, in_subs, select_lex))
{