Automerge.

6c2b7b24 · Alexey Kopytov · 6947ee37 · e9856e66 · 6c2b7b24
Commit 6c2b7b24 authored Nov 12, 2009 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1301,7 +1301,7 @@ JOIN::optimize()
 	     ((select_distinct || !simple_order || !simple_group) ||
 	      (group_list && order) ||
 	      test(select_options & OPTION_BUFFER_RESULT))) ||
-             rollup.state != ROLLUP::STATE_NONE && select_distinct);
+             (rollup.state != ROLLUP::STATE_NONE && select_distinct));

  // No cache for MATCH
  make_join_readinfo(this,