From 05947d9916a9b85a32d8cda770de12ceb544e90f Mon Sep 17 00:00:00 2001
From: "igor@rurik.mysql.com" <>
Date: Sat, 7 Jan 2006 23:00:06 -0800
Subject: [PATCH] Fixed bug #14274: a query with a having clause containing
 only set function returned a wrong result set.

---
 mysql-test/r/having.result | 13 +++++++++++++
 mysql-test/t/having.test   | 12 ++++++++++++
 sql/sql_select.cc          |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result
index 218276406b1..9730f9f81bf 100644
--- a/mysql-test/r/having.result
+++ b/mysql-test/r/having.result
@@ -128,3 +128,16 @@ id	description	c
 1	test	0
 2	test2	0
 drop table t1,t2,t3;
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (3), (4), (1), (3), (1);
+SELECT SUM(a) FROM t1 GROUP BY a HAVING SUM(a)>0;
+SUM(a)
+2
+6
+4
+SELECT SUM(a) FROM t1 GROUP BY a HAVING SUM(a);
+SUM(a)
+2
+6
+4
+DROP TABLE t1;
diff --git a/mysql-test/t/having.test b/mysql-test/t/having.test
index 920a3b752ab..3dd9ace6a1b 100644
--- a/mysql-test/t/having.test
+++ b/mysql-test/t/having.test
@@ -123,4 +123,16 @@ group by a.id, a.description
 having (a.description is not null) and (c=0);
 drop table t1,t2,t3;
 
+#
+# Bug #14274: HAVING clause containing only set function
+#
+
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (3), (4), (1), (3), (1);
+
+SELECT SUM(a) FROM t1 GROUP BY a HAVING SUM(a)>0;
+SELECT SUM(a) FROM t1 GROUP BY a HAVING SUM(a);
+
+DROP TABLE t1;
+
 # End of 4.1 tests
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5e29c98e2c8..09900c89307 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -287,7 +287,7 @@ JOIN::prepare(Item ***rref_pointer_array,
     if (having_fix_rc || thd->net.report_error)
       DBUG_RETURN(-1);				/* purecov: inspected */
     if (having->with_sum_func)
-      having->split_sum_func(thd, ref_pointer_array, all_fields);
+      having->split_sum_func2(thd, ref_pointer_array, all_fields, &having);
   }
 
   // Is it subselect