Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam (78a0706a) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/group_by.result

+146 −0

Original line number	Diff line number	Diff line
		@@ -1128,6 +1128,152 @@ id c1 c2
		4 2 3
		1 5 1
		DROP TABLE t1;
		#
		# Bug#27219: Aggregate functions in ORDER BY.
		#
		SET @save_sql_mode=@@sql_mode;
		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;
		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;
		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);
		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 SUM(t2.a) FROM t2);
		a
		3
		2
		3
		2
		3
		4
		SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a), t2.a FROM t2);
		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 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
		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
		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
		SELECT t1.a FROM t1 GROUP BY t1.a
		HAVING t1.a IN (SELECT t2.a FROM t2 ORDER BY SUM(t1.b));
		a
		2
		3
		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
		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
		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
		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
		1
		1
		1
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + t2.b) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
		1
		1
		1
		1
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(t1.b + t2.b) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
		1
		1
		1
		1
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + 1) FROM t2 ORDER BY 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
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + t2.b) FROM t2 ORDER BY 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
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(t1.b + t2.b) FROM t2 ORDER BY 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
		SELECT t1.a FROM t1
		WHERE t1.a = (SELECT t2.a FROM t2 GROUP BY t2.a
		ORDER BY SUM(t2.b), SUM(t1.b) LIMIT 1);
		a
		4
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2 GROUP BY t2.a
		ORDER BY SUM(t2.b), SUM(t1.b) LIMIT 1)
		GROUP BY t1.a;
		a SUM(t1.b)
		4 4
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2
		ORDER BY SUM(t2.b) + SUM(t1.b) LIMIT 1)
		GROUP BY t1.a;
		a SUM(t1.b)
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2
		ORDER BY SUM(t2.b + t1.a) LIMIT 1)
		GROUP BY t1.a;
		a SUM(t1.b)
		SELECT t1.a FROM t1 GROUP BY t1.a
		HAVING (1, 1) = (SELECT SUM(t1.a), t1.a FROM t2 LIMIT 1);
		a
		select avg (
		(select
		(select sum(outr.a + innr.a) from t1 as innr limit 1) as tt
		from t1 as outr order by outr.a limit 1))
		from t1 as most_outer;
		avg (
		(select
		(select sum(outr.a + innr.a) from t1 as innr limit 1) as tt
		from t1 as outr order by outr.a limit 1))
		29.0000
		select avg (
		(select (
		(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
		select (select sum(outr.a + t1.a) from t1 limit 1) as tt from t1 as outr order by outr.a;
		tt
		29
		29
		35
		35
		35
		41
		SET sql_mode=@save_sql_mode;
		DROP TABLE t1, t2;
		End of 5.0 tests
		CREATE TABLE t1 (a INT, b INT,
		PRIMARY KEY (a),

mysql-test/r/temp_table.result

+11 −0

Original line number	Diff line number	Diff line
		@@ -184,3 +184,14 @@ select * from t1;
		a
		42
		drop table t1;
		CREATE TEMPORARY TABLE t1(a INT, b VARCHAR(20));
		INSERT INTO t1 VALUES(1, 'val1'), (2, 'val2'), (3, 'val3');
		DELETE FROM t1 WHERE a=1;
		SELECT count(*) FROM t1;
		count(*)
		2
		DELETE FROM t1;
		SELECT * FROM t1;
		a b
		DROP TABLE t1;
		End of 5.1 tests

mysql-test/t/group_by.test

+117 −0

Original line number	Diff line number	Diff line
		@@ -823,6 +823,123 @@ SELECT * FROM t1 GROUP BY c2 ORDER BY c2 DESC, c1 DESC;
		DROP TABLE t1;


		--echo #
		--echo # Bug#27219: Aggregate functions in ORDER BY.
		--echo #
		SET @save_sql_mode=@@sql_mode;
		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(*);
		SELECT 1 FROM t1 ORDER BY COUNT(*) + 1;
		--error 1140
		SELECT 1 FROM t1 ORDER BY COUNT(*) + a;
		SELECT 1 FROM t1 ORDER BY COUNT(*), 1;
		--error 1140
		SELECT 1 FROM t1 ORDER BY COUNT(*), a;

		SELECT 1 FROM t1 ORDER BY SUM(a);
		SELECT 1 FROM t1 ORDER BY SUM(a + 1);
		SELECT 1 FROM t1 ORDER BY SUM(a) + 1;
		--error 1140
		SELECT 1 FROM t1 ORDER BY SUM(a), b;

		--error 1140
		SELECT a FROM t1 ORDER BY COUNT(b);

		SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a) FROM t2);

		--error 1140
		SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a), t2.a FROM t2);
		--error 1140
		SELECT t1.a FROM t1 ORDER BY (SELECT SUM(t2.a) FROM t2 ORDER BY t2.a);
		--error 1140
		SELECT t1.a FROM t1 ORDER BY (SELECT t2.a FROM t2 ORDER BY SUM(t2.b) LIMIT 1);

		--error 1140
		SELECT t1.a FROM t1
		WHERE t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t2.b) LIMIT 1);
		--error 1140
		SELECT t1.a FROM t1 GROUP BY t1.a
		HAVING t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t2.a) LIMIT 1);

		SELECT t1.a FROM t1 GROUP BY t1.a
		HAVING t1.a IN (SELECT t2.a FROM t2 ORDER BY SUM(t1.b));
		--error 1140
		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 1140
		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 1140
		SELECT t1.a FROM t1
		WHERE t1.a = (SELECT t2.a FROM t2 ORDER BY SUM(t1.b));

		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + 1) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + t2.b) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(t1.b + t2.b) FROM t2 ORDER BY SUM(t2.a) LIMIT 1);

		--error 1140
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + 1) FROM t2 ORDER BY t2.a LIMIT 1);
		--error 1140
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(SUM(t1.b) + t2.b) FROM t2 ORDER BY t2.a LIMIT 1);
		--error 1140
		SELECT 1 FROM t1 GROUP BY t1.a
		HAVING (SELECT AVG(t1.b + t2.b) FROM t2 ORDER BY t2.a LIMIT 1);

		# Both SUMs are aggregated in the subquery, no mixture:
		SELECT t1.a FROM t1
		WHERE t1.a = (SELECT t2.a FROM t2 GROUP BY t2.a
		ORDER BY SUM(t2.b), SUM(t1.b) LIMIT 1);

		# SUM(t1.b) is aggregated in the subquery, no mixture:
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2 GROUP BY t2.a
		ORDER BY SUM(t2.b), SUM(t1.b) LIMIT 1)
		GROUP BY t1.a;

		# 2nd SUM(t1.b) is aggregated in the subquery, no mixture:
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2
		ORDER BY SUM(t2.b) + SUM(t1.b) LIMIT 1)
		GROUP BY t1.a;

		# SUM(t2.b + t1.a) is aggregated in the subquery, no mixture:
		SELECT t1.a, SUM(t1.b) FROM t1
		WHERE t1.a = (SELECT SUM(t2.b) FROM t2
		ORDER BY SUM(t2.b + t1.a) LIMIT 1)
		GROUP BY t1.a;

		SELECT t1.a FROM t1 GROUP BY t1.a
		HAVING (1, 1) = (SELECT SUM(t1.a), t1.a FROM t2 LIMIT 1);

		select avg (
		(select
		(select sum(outr.a + innr.a) from t1 as innr limit 1) as tt
		from t1 as outr order by outr.a limit 1))
		from t1 as most_outer;

		--error 1140
		select avg (
		(select (
		(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;

		select (select sum(outr.a + t1.a) from t1 limit 1) as tt from t1 as outr order by outr.a;

		SET sql_mode=@save_sql_mode;
		DROP TABLE t1, t2;

		--echo End of 5.0 tests
		# Bug #21174: Index degrades sort performance and
		# optimizer does not honor IGNORE INDEX.

mysql-test/t/temp_table.test

+14 −0

Original line number	Diff line number	Diff line
		@@ -191,3 +191,17 @@ truncate t1;
		insert into t1 values (42);
		select * from t1;
		drop table t1;

		#
		# Bug #35392: Delete all statement does not execute properly after
		# few delete statements
		#
		CREATE TEMPORARY TABLE t1(a INT, b VARCHAR(20));
		INSERT INTO t1 VALUES(1, 'val1'), (2, 'val2'), (3, 'val3');
		DELETE FROM t1 WHERE a=1;
		SELECT count(*) FROM t1;
		DELETE FROM t1;
		SELECT * FROM t1;
		DROP TABLE t1;

		--echo End of 5.1 tests

sql/item.cc

+24 −4

Original line number	Diff line number	Diff line
		@@ -4003,9 +4003,9 @@ bool Item_field::fix_fields(THD thd, Item *reference)
		}
		if ((ret= fix_outer_field(thd, &from_field, reference)) < 0)
		goto error;
		else if (!ret)
		return FALSE;
		outer_fixed= TRUE;
		if (!ret)
		goto mark_non_agg_field;
		}
		else if (!from_field)
		goto error;
		@@ -4017,9 +4017,9 @@ bool Item_field::fix_fields(THD thd, Item *reference)
		int ret;
		if ((ret= fix_outer_field(thd, &from_field, reference)) < 0)
		goto error;
		if (!ret)
		return FALSE;
		outer_fixed= 1;
		if (!ret)
		goto mark_non_agg_field;
		}

		/*
		@@ -4103,6 +4103,26 @@ bool Item_field::fix_fields(THD thd, Item *reference)
		thd->lex->current_select->non_agg_fields.push_back(this);
		marker= thd->lex->current_select->cur_pos_in_select_list;
		}
		mark_non_agg_field:
		if (fixed && thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY)
		{
		/*
		Mark selects according to presence of non aggregated fields.
		Fields from outer selects added to the aggregate function
		outer_fields list as its unknown at the moment whether it's
		aggregated or not.
		*/
		if (!thd->lex->in_sum_func)
		cached_table->select_lex->full_group_by_flag\|= NON_AGG_FIELD_USED;
		else
		{
		if (outer_fixed)
		thd->lex->in_sum_func->outer_fields.push_back(this);
		else if (thd->lex->in_sum_func->nest_level !=
		thd->lex->current_select->nest_level)
		cached_table->select_lex->full_group_by_flag\|= NON_AGG_FIELD_USED;
		}
		}
		return FALSE;

		error: