From 19da4d3972bf32831df76f983f97ed8a4c7b4ce2 Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Tue, 20 Mar 2007 11:51:09 -0700
Subject: [PATCH] Fixed bug #27257: queries containing subqueries with COUNT(*)
 aggregated in outer context returned wrong results. This happened only if the
 subquery did not contain any references to outer fields. As there were no
 references to outer fields the subquery erroneously was taken for
 non-correlated one. Now any set function aggregated in outer context makes
 the subquery correlated.

---
 mysql-test/r/subselect.result | 25 +++++++++++++++++++++++++
 mysql-test/t/subselect.test   | 21 +++++++++++++++++++++
 sql/item_sum.cc               |  1 +
 3 files changed, 47 insertions(+)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index f2d41bd44ae..72bde001e87 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -3880,3 +3880,28 @@ this is a test.	3
 this is a test.	1
 this is a test.	2
 DROP table t1;
+CREATE TABLE t1 (a int, b int);
+CREATE TABLE t2 (m int, n int);
+INSERT INTO t1 VALUES (2,2), (2,2), (3,3), (3,3), (3,3), (4,4);
+INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);
+SELECT COUNT(*), a,
+(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)
+FROM t1 GROUP BY a;
+COUNT(*)	a	(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)
+2	2	2
+3	3	3
+1	4	1
+SELECT COUNT(*), a,
+(SELECT MIN(m) FROM t2 WHERE m = count(*))
+FROM t1 GROUP BY a;
+COUNT(*)	a	(SELECT MIN(m) FROM t2 WHERE m = count(*))
+2	2	2
+3	3	3
+1	4	1
+SELECT COUNT(*), a       
+FROM t1 GROUP BY a
+HAVING (SELECT MIN(m) FROM t2 WHERE m = count(*)) > 1;
+COUNT(*)	a
+2	2
+3	3
+DROP TABLE t1,t2;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 1655422c51e..a238c8f070b 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -2741,4 +2741,25 @@ SELECT * FROM (SELECT 'this is ' 'a test.' AS col1, a AS t2 FROM t1) t;
 
 DROP table t1;
 
+#
+# Bug #27257: COUNT(*) aggregated in outer query
+#  
 
+CREATE TABLE t1 (a int, b int);
+CREATE TABLE t2 (m int, n int);
+INSERT INTO t1 VALUES (2,2), (2,2), (3,3), (3,3), (3,3), (4,4);
+INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);
+
+SELECT COUNT(*), a,
+       (SELECT m FROM t2 WHERE m = count(*) LIMIT 1)
+  FROM t1 GROUP BY a;
+
+SELECT COUNT(*), a,
+       (SELECT MIN(m) FROM t2 WHERE m = count(*))
+  FROM t1 GROUP BY a;
+
+SELECT COUNT(*), a       
+  FROM t1 GROUP BY a
+    HAVING (SELECT MIN(m) FROM t2 WHERE m = count(*)) > 1;
+
+DROP TABLE t1,t2;
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 41f0dd6496b..a8ffa200102 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -267,6 +267,7 @@ bool Item_sum::register_sum_func(THD *thd, Item **ref)
          sl= sl->master_unit()->outer_select() )
       sl->master_unit()->item->with_sum_func= 1;
   }
+  thd->lex->current_select->mark_as_dependent(aggr_sl);
   return FALSE;
 }