From 72a8049b0dda6e06d893f3be64a2aced4c94eed4 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 23 Sep 2005 14:37:22 +0200
Subject: Merge from 4.1 to 5.0

mysql-test/r/loaddata.result:
  Add drop tablea after test case
mysql-test/r/type_decimal.result:
  Update warnings
mysql-test/r/union.result:
  Miss in merge
mysql-test/t/loaddata.test:
  Add drop table after test case
sql/opt_sum.cc:
  Add missing }
sql/sql_load.cc:
  Manual merge
---
 sql/opt_sum.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sql/opt_sum.cc')

diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index d598b8e6402..2f54cce0275 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -167,6 +167,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
           {
             ((Item_sum_count*) item)->make_const(count);
             recalc_const_item= 1;
+          }
         }
         else
           const_result= 0;
-- 
cgit v1.2.1