Commit e9856e66 authored by Alexey Kopytov's avatar Alexey Kopytov

Automerge.

parents 48c67b2c a5280036
...@@ -1229,7 +1229,7 @@ JOIN::optimize() ...@@ -1229,7 +1229,7 @@ JOIN::optimize()
((select_distinct || !simple_order || !simple_group) || ((select_distinct || !simple_order || !simple_group) ||
(group_list && order) || (group_list && order) ||
test(select_options & OPTION_BUFFER_RESULT))) || test(select_options & OPTION_BUFFER_RESULT))) ||
rollup.state != ROLLUP::STATE_NONE && select_distinct); (rollup.state != ROLLUP::STATE_NONE && select_distinct));
// No cache for MATCH // No cache for MATCH
make_join_readinfo(this, make_join_readinfo(this,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment