bzr commit into mysql-5.0-bugteam branch (Alexey.Kopytov:2843) Bug#48475

[Alexey Kopytov]

#At file:///data/src/bzr/bugteam/bug48475/my50-bug48475/ based on revid:alexey.kopytov@stripped

 2843 Alexey Kopytov	2009-11-12
      Fixed a gcc warning introduced by the patch for bug #48475.

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2009-11-06 06:44:01 +0000
+++ b/sql/sql_select.cc	2009-11-12 17:11:33 +0000
@@ -1229,7 +1229,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,


Attachment: [text/bzr-bundle] bzr/[e-mail]