Bug#18694751 72512: Non-aggregated query with set function in ORDER BY should be rejected

A non-aggregated query with an ORDER BY applied to it cannot contain
aggregate functions. This patch prevents such queries.

A new error message is added: ER_AGGREGATE_ORDER_NON_AGG_QUERY.

Notice that one test case with HAVING and an aggregated argument fails but
should not. This is because of a wrong resolve order in
SELECT_LEX::prepare().

Author: roylyseng

mysql-test/include/order_by.inc

@@ -1711,7 +1711,7 @@ DROP TABLE t1;
 --echo # VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
 --echo #
 
-select 1 order by max(1) + min(1);
+select count(*) order by max(1) + min(1);
 
 --echo End of 5.1 tests
 

mysql-test/include/subquery.inc

@@ -3939,14 +3939,14 @@ CREATE TABLE t3 LIKE t1;
 
 --echo # should have 1 impossible where and 2 dependent subqueries
 EXPLAIN
-SELECT 1 FROM t1
+SELECT COUNT(*) FROM t1
 WHERE NOT EXISTS (SELECT 1 FROM t2 WHERE 1 = (SELECT MIN(t2.b) FROM t3))
-ORDER BY count(*);
+ORDER BY COUNT(*);
 
 --echo # should not crash the next statement
-SELECT 1 FROM t1
+SELECT COUNT(*) FROM t1
 WHERE NOT EXISTS (SELECT 1 FROM t2 WHERE 1 = (SELECT MIN(t2.b) FROM t3))
-ORDER BY count(*);
+ORDER BY COUNT(*);
 
 --echo # should not crash: the crash is caused by the previous statement
 SELECT 1;
@@ -4658,11 +4658,13 @@ DROP TABLE t1, t2;
 #
 CREATE TABLE t1 (a ENUM('rainbow'));
 INSERT INTO t1 VALUES (),(),(),(),();
-SELECT 1 FROM t1 GROUP BY (SELECT 1 FROM t1 ORDER BY AVG(LAST_INSERT_ID()));
+SELECT 1
+FROM t1 GROUP BY (SELECT COUNT(*) FROM t1 ORDER BY AVG(LAST_INSERT_ID()));
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGBLOB);
 INSERT INTO t1 SET a = 'aaaa';
 INSERT INTO t1 SET a = 'aaaa';
+--error ER_AGGREGATE_ORDER_NON_AGG_QUERY
 SELECT 1 FROM t1 GROUP BY
   (SELECT LAST_INSERT_ID() FROM t1 ORDER BY MIN(a) ASC LIMIT 1);
 DROP TABLE t1;

mysql-test/r/func_group.result

@@ -1481,11 +1481,9 @@ CREATE TABLE t1 (a INT);
 INSERT INTO t1 values (),(),();
 SELECT (SELECT SLEEP(0) FROM t1 ORDER BY AVG(DISTINCT a) ) as x FROM t1 
 GROUP BY x;
-x
-0
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT 1 FROM t1 GROUP BY (SELECT SLEEP(0) FROM t1 ORDER BY AVG(DISTINCT a) );
-1
-1
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 DROP TABLE t1;
 CREATE TABLE t1 (a int, b date NOT NULL, KEY k1 (a,b));
 SELECT MIN(b) FROM t1 WHERE a=1 AND b>'2007-08-01';
@@ -1879,8 +1877,7 @@ End of 5.1 tests
 CREATE TABLE t1(a int, KEY(a));
 INSERT INTO t1 VALUES (1), (2);
 SELECT 1 FROM t1 ORDER BY AVG(DISTINCT a);
-1
-1
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 DROP TABLE t1;
 #
 # Bug#55648: Server crash on MIN/MAX on maximum time value

mysql-test/r/group_by.result

@@ -1172,32 +1172,33 @@ SET @@sql_mode='ONLY_FULL_GROUP_BY';
 CREATE TABLE t1 (a INT, b INT, c INT DEFAULT 0);
 INSERT INTO t1 (a, b) VALUES (3,3), (2,2), (3,3), (2,2), (3,3), (4,4);
 CREATE TABLE t2 SELECT * FROM t1;
-SELECT 1 FROM t1 ORDER BY COUNT(*);
-1
-1
-SELECT 1 FROM t1 ORDER BY COUNT(*) + 1;
-1
-1
-SELECT 1 FROM t1 ORDER BY COUNT(*) + a;
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
-SELECT 1 FROM t1 ORDER BY COUNT(*), 1;
-1
-1
-SELECT 1 FROM t1 ORDER BY COUNT(*), a;
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*);
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*) + 1;
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*) + a;
 ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
-SELECT 1 FROM t1 ORDER BY SUM(a);
-1
-1
-SELECT 1 FROM t1 ORDER BY SUM(a + 1);
-1
-1
-SELECT 1 FROM t1 ORDER BY SUM(a) + 1;
-1
-1
-SELECT 1 FROM t1 ORDER BY SUM(a), b;
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*), 1;
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*), a;
 ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
-SELECT a FROM t1 ORDER BY COUNT(b);
+SELECT COUNT(*) FROM t1 ORDER BY SUM(a);
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY SUM(a + 1);
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY SUM(a) + 1;
+COUNT(*)
+6
+SELECT COUNT(*) FROM t1 ORDER BY SUM(a), b;
 ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+SELECT SUM(a) FROM t1 ORDER BY COUNT(b);
+SUM(a)
+17
 SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a) FROM t2);
 a
 3
@@ -1211,13 +1212,13 @@ ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP col
 SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a) FROM t2 ORDER BY t2.a);
 ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
 SELECT t1.a FROM t1 ORDER BY (SELECT t2.a FROM t2 ORDER BY SUM(t2.b) LIMIT 1);
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT t1.a FROM t1
 WHERE t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t2.b) LIMIT 1);
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT t1.a FROM t1 GROUP BY t1.a
 HAVING t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT t1.a FROM t1 GROUP BY t1.a
 HAVING t1.a IN (SELECT t2.a FROM t2 ORDER BY SUM(t1.b));
 a
@@ -1226,13 +1227,13 @@ a
 4
 SELECT t1.a FROM t1 GROUP BY t1.a
 HAVING t1.a IN (SELECT t2.a FROM t2 ORDER BY t2.a, SUM(t2.b));
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #2 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT t1.a FROM t1 GROUP BY t1.a
 HAVING t1.a > ANY (SELECT t2.a FROM t2 ORDER BY t2.a, SUM(t2.b));
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #2 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT t1.a FROM t1
 WHERE t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t1.b));
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 SELECT 1 FROM t1 GROUP BY t1.a
 HAVING (SELECT AVG(SUM(t1.b) + 1) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
 1
@@ -1299,7 +1300,7 @@ select avg (
 (select sum(outr.a + innr.a) from t1 as innr limit 1)) as tt
 from t1 as outr order by count(outr.a) limit 1)) as tt
 from t1 as most_outer;
-ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 select (select sum(outr.a + t1.a) from t1 limit 1) as tt from t1 as outr order by outr.a;
 tt
 29
@@ -2849,3 +2850,147 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`kp1` AS `kp1`,sum(`test`.`t1`.`kp2`) AS `SUM(kp2)` from `test`.`t1` group by `test`.`t1`.`kp1`
 DROP TABLE t1;
+# Bug#72512/18694751: Non-aggregated query with set function in
+# ORDER BY should be rejected
+CREATE TABLE t1(a INTEGER);
+INSERT INTO t1 VALUES (1), (2);
+# Non-aggregated queries
+SELECT a FROM t1 ORDER BY COUNT(*);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+SELECT a FROM t1 WHERE a > 0 ORDER BY COUNT(*);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+# Implicitly grouped query
+SELECT SUM(a) FROM t1 ORDER BY COUNT(*);
+SUM(a)
+3
+SELECT COUNT(*) FROM t1 ORDER BY COUNT(*);
+COUNT(*)
+2
+SELECT COUNT(*) AS c FROM t1 ORDER BY COUNT(*);
+c
+2
+SELECT COUNT(*) AS c FROM t1 ORDER BY c;
+c
+2
+# Explicitly grouped query
+SELECT a, COUNT(*) FROM t1 GROUP BY a ORDER BY COUNT(*);
+a	COUNT(*)
+1	1
+2	1
+SELECT a, COUNT(*) AS c FROM t1 GROUP BY a ORDER BY COUNT(*);
+a	c
+1	1
+2	1
+SELECT a, COUNT(*) AS c FROM t1 GROUP BY a ORDER BY c;
+a	c
+1	1
+2	1
+SELECT a AS c FROM t1 GROUP BY a ORDER BY COUNT(*);
+c
+1
+2
+# Query with HAVING,
+# Should succeed, but GROUP - HAVING - ORDER are resolved in wrong order
+SELECT 1 FROM t1 HAVING COUNT(*) > 1 ORDER BY COUNT(*);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+# Subquery, ORDER BY contains outer reference
+SELECT (SELECT 1 AS foo ORDER BY a) AS x
+FROM t1;
+x
+1
+1
+SELECT (SELECT 1 AS foo ORDER BY t1.a) AS x
+FROM t1;
+x
+1
+1
+# Subquery, ORDER BY contains set function with outer reference
+SELECT (SELECT 1 AS foo ORDER BY COUNT(a)) AS x
+FROM t1;
+x
+1
+SELECT (SELECT 1 AS foo ORDER BY COUNT(t1.a)) AS x
+FROM t1;
+x
+1
+# Subquery, ORDER BY contains set function with local reference
+SELECT (SELECT 1 AS foo ORDER BY COUNT(*)) AS x
+FROM t1;
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+# Subquery in ORDER BY with outer reference
+SELECT a FROM t1 ORDER BY (SELECT COUNT(t1.a) FROM t1 AS t2);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+SELECT SUM(a) FROM t1 ORDER BY (SELECT COUNT(t1.a) FROM t1 AS t2);
+SUM(a)
+3
+# Query with ORDER BY inside UNION
+# (Notice that ORDER BY is ignored for UNION component queries)
+(SELECT a FROM t1 ORDER BY COUNT(*))
+UNION
+SELECT a FROM t1;
+a
+1
+2
+(SELECT a FROM t1 ORDER BY COUNT(*))
+UNION ALL
+SELECT a FROM t1;
+a
+1
+2
+1
+2
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1)
+UNION
+SELECT a FROM t1;
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1)
+UNION ALL
+SELECT a FROM t1;
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+SELECT a FROM t1
+UNION
+(SELECT a FROM t1 ORDER BY COUNT(*));
+a
+1
+2
+SELECT a FROM t1
+UNION ALL
+(SELECT a FROM t1 ORDER BY COUNT(*));
+a
+1
+2
+1
+2
+SELECT a FROM t1
+UNION
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1 OFFSET 1);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+SELECT a FROM t1
+UNION ALL
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1 OFFSET 1);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+(SELECT a FROM t1 ORDER BY COUNT(*))
+UNION
+(SELECT a FROM t1 ORDER BY COUNT(*));
+a
+1
+2
+(SELECT a FROM t1 ORDER BY COUNT(*))
+UNION ALL
+(SELECT a FROM t1 ORDER BY COUNT(*));
+a
+1
+2
+1
+2
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1)
+UNION
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1 OFFSET 1);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1)
+UNION ALL
+(SELECT a FROM t1 ORDER BY COUNT(*) LIMIT 1 OFFSET 1);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+(SELECT COUNT(*) FROM t1 ORDER BY a) ORDER BY COUNT(*);
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
+DROP TABLE t1;

mysql-test/r/order_by_all.result

@@ -2656,8 +2656,8 @@ DROP TABLE t1;
 # Bug#11765255 58201:
 # VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
 #
-select 1 order by max(1) + min(1);
-1
+select count(*) order by max(1) + min(1);
+count(*)
 1
 End of 5.1 tests
 #

mysql-test/r/order_by_icp_mrr.result

@@ -2656,8 +2656,8 @@ DROP TABLE t1;
 # Bug#11765255 58201:
 # VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
 #
-select 1 order by max(1) + min(1);
-1
+select count(*) order by max(1) + min(1);
+count(*)
 1
 End of 5.1 tests
 #

mysql-test/r/order_by_none.result

@@ -2655,8 +2655,8 @@ DROP TABLE t1;
 # Bug#11765255 58201:
 # VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
 #
-select 1 order by max(1) + min(1);
-1
+select count(*) order by max(1) + min(1);
+count(*)
 1
 End of 5.1 tests
 #

mysql-test/r/query_cache.result

@@ -1690,7 +1690,8 @@ End of 5.0 tests
 SET GLOBAL query_cache_size=1024*1024*512;
 CREATE TABLE t1 (a ENUM('rainbow'));
 INSERT INTO t1 VALUES (),(),(),(),();
-SELECT 1 FROM t1 GROUP BY (SELECT 1 FROM t1 ORDER BY AVG(LAST_INSERT_ID()));
+SELECT 1 FROM t1
+GROUP BY (SELECT COUNT(*) FROM t1 ORDER BY AVG(LAST_INSERT_ID()));
 1
 1
 DROP TABLE t1;
@@ -1699,8 +1700,7 @@ INSERT INTO t1 SET a = 'aaaa';
 INSERT INTO t1 SET a = 'aaaa';
 SELECT 1 FROM t1 GROUP BY
 (SELECT LAST_INSERT_ID() FROM t1 ORDER BY MIN(a) ASC LIMIT 1);
-1
-1
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to the result of a non-aggregated query
 DROP TABLE t1;
 SET GLOBAL query_cache_size= default;
 CREATE TABLE t1( a INT );