From 9fd2c861038facb19b9dc8df3c0c645915a6f407 Mon Sep 17 00:00:00 2001
From: "kroki/tomash@moonlight.intranet" <>
Date: Wed, 18 Oct 2006 15:20:34 +0400
Subject: Fix for valgrind warning introduced by the fix for bug#21354:
 (COUNT(*) = 1) not working in SELECT inside prepared statement. Note: the
 warning was introduced in 5.0 and 5.1, 4.1 is OK with the original fix.

The problem was that in 5.0 and 5.1 clear() for group functions may
access hybrid_type member, and this member is initialized in
fix_fields().

So we should not call clear() from item cleanup() methods, as cleanup()
may be called for unfixed items.
---
 sql/item_sum.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item_sum.cc')

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 513fa46ecb3..397293bc131 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1055,7 +1055,7 @@ longlong Item_sum_count::val_int()
 void Item_sum_count::cleanup()
 {
   DBUG_ENTER("Item_sum_count::cleanup");
-  clear();
+  count= 0;
   Item_sum_int::cleanup();
   used_table_cache= ~(table_map) 0;
   DBUG_VOID_RETURN;
-- 
cgit v1.2.1