diff options
| author | unknown <timour@askmonty.org> | 2011-11-21 16:56:32 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-11-21 16:56:32 +0200 |
| commit | f0d9908fc3582cf08db7e0376f0e243b1e754ad5 (patch) | |
| tree | c05ad7a90dcb96d7d31452311085480a8b06dd5c /sql/opt_subselect.cc | |
| parent | 9cde33f9ef139f7511db66393694bbc3af6a863f (diff) | |
| parent | 32d230d67bce5c4b19e25392c74b2fe8c9419248 (diff) | |
| download | mariadb-git-f0d9908fc3582cf08db7e0376f0e243b1e754ad5.tar.gz | |
Merge enabling of materialization=on by default with main tree.
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index a954811bdfa..b76b78a67a0 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)) { |