bzr commit into mysql-5.1-telco-7.0-spj branch (jonas:3151)

[Jonas Oreland]

#At file:///home/jonas/src/70-spj/ based on revid:jonas@stripped

 3151 Jonas Oreland	2010-05-11 [merge]
      ndb spj - merge 70-spj

    modified:
      sql/opt_sum.cc
=== modified file 'sql/opt_sum.cc'
--- a/sql/opt_sum.cc	2009-12-17 10:14:52 +0000
+++ b/sql/opt_sum.cc	2010-05-07 13:49:05 +0000
@@ -359,7 +359,13 @@ int opt_sum_query(TABLE_LIST *tables, Li
           const_result= 0;
           break;
         }
-        if (!count)
+        /* SPJ MERGE TODO Bug#52051
+         * This is a temp. fix for bug52051, without the code restructure
+         * being part of the proposed patch.
+         * Expect merge conflict here when later merging with a main branch
+         * containing this fix.
+         */
+        if (!count && !outer_tables)
         {
           /* If count == 0, then we know that is_exact_count == TRUE. */
           ((Item_sum_min*) item_sum)->clear(); /* Set to NULL. */
@@ -447,7 +453,13 @@ int opt_sum_query(TABLE_LIST *tables, Li
           const_result= 0;
           break;
         }
-        if (!count)
+        /* SPJ MERGE TODO Bug#52051
+         * This is a temp. fix for bug52051, without the code restructure
+         * being part of the proposed patch.
+         * Expect merge conflict here when later merging with a main branch
+         * containing this fix.
+         */
+        if (!count && !outer_tables)
         {
           /* If count != 1, then we know that is_exact_count == TRUE. */
           ((Item_sum_max*) item_sum)->clear(); /* Set to NULL. */


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