Merge bk@192.168.21.1:mysql-5.0-opt (c6af7ee1) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/subselect.result

+38 −2

Original line number	Diff line number	Diff line
		@@ -1160,7 +1160,7 @@ Code2 char(2) NOT NULL default '',
		PRIMARY KEY (Code)
		) ENGINE=MyISAM;
		INSERT INTO t2 VALUES ('AUS','Australia','Oceania','Australia and New Zealand',7741220.00,1901,18886000,79.8,351182.00,392911.00,'Australia','Constitutional Monarchy, Federation','Elisabeth II',135,'AU');
		INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azrbaycan','Federal Republic','Heydr liyev',144,'AZ');
		INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azärbaycan','Federal Republic','Heydär Äliyev',144,'AZ');
		select t2.Continent, t1.Name, t1.Population from t2 LEFT JOIN t1 ON t2.Code = t1.t2 where t1.Population IN (select max(t1.Population) AS Population from t1, t2 where t1.t2 = t2.Code group by Continent);
		Continent Name Population
		Oceania Sydney 3276207
		@@ -2512,7 +2512,7 @@ Code2 char(2) NOT NULL default ''
		) ENGINE=MyISAM;
		INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
		INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
		INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes franaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
		INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes françaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
		INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');
		/!40000 ALTER TABLE t1 ENABLE KEYS /;
		SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);
		@@ -2966,6 +2966,42 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;
		a a b
		10 1 359
		drop table t1,t2;
		CREATE TABLE t1 (
		field1 int NOT NULL,
		field2 int NOT NULL,
		field3 int NOT NULL,
		PRIMARY KEY (field1,field2,field3)
		);
		CREATE TABLE t2 (
		fieldA int NOT NULL,
		fieldB int NOT NULL,
		PRIMARY KEY (fieldA,fieldB)
		);
		INSERT INTO t1 VALUES
		(1,1,1), (1,1,2), (1,2,1), (1,2,2), (1,2,3), (1,3,1);
		INSERT INTO t2 VALUES (1,1), (1,2), (1,3);
		SELECT field1, field2, COUNT(*)
		FROM t1 GROUP BY field1, field2;
		field1 field2 COUNT(*)
		1 1 2
		1 2 3
		1 3 1
		SELECT field1, field2
		FROM t1
		GROUP BY field1, field2
		HAVING COUNT(*) >= ALL (SELECT fieldB
		FROM t2 WHERE fieldA = field1);
		field1 field2
		1 2
		SELECT field1, field2
		FROM t1
		GROUP BY field1, field2
		HAVING COUNT(*) < ANY (SELECT fieldB
		FROM t2 WHERE fieldA = field1);
		field1 field2
		1 1
		1 3
		DROP TABLE t1, t2;
		create table t1 (df decimal(5,1));
		insert into t1 values(1.1);
		insert into t1 values(2.2);

mysql-test/r/view.result

+14 −0

Original line number	Diff line number	Diff line
		@@ -2935,4 +2935,18 @@ id select_type table type possible_keys key key_len ref rows Extra
		2 SUBQUERY t1 ALL NULL NULL NULL NULL 3
		DROP VIEW v1;
		DROP TABLE t1;
		CREATE TABLE t1(pk int PRIMARY KEY);
		CREATE TABLE t2(pk int PRIMARY KEY, fk int, ver int, org int);
		CREATE ALGORITHM=MERGE VIEW v1 AS
		SELECT t1.*
		FROM t1 JOIN t2
		ON t2.fk = t1.pk AND
		t2.ver = (SELECT MAX(t.ver) FROM t2 t WHERE t.org = t2.org);
		SHOW WARNINGS;
		Level Code Message
		SHOW CREATE VIEW v1;
		View Create View
		v1 CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`pk` AS `pk` from (`t1` join `t2` on(((`t2`.`fk` = `t1`.`pk`) and (`t2`.`ver` = (select max(`t`.`ver`) AS `MAX(t.ver)` from `t2` `t` where (`t`.`org` = `t2`.`org`))))))
		DROP VIEW v1;
		DROP TABLE t1, t2;
		End of 5.0 tests.

mysql-test/t/subselect.test

+39 −2

Original line number	Diff line number	Diff line
		@@ -665,7 +665,7 @@ CREATE TABLE t2 (
		) ENGINE=MyISAM;

		INSERT INTO t2 VALUES ('AUS','Australia','Oceania','Australia and New Zealand',7741220.00,1901,18886000,79.8,351182.00,392911.00,'Australia','Constitutional Monarchy, Federation','Elisabeth II',135,'AU');
		INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azrbaycan','Federal Republic','Heydr liyev',144,'AZ');
		INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azärbaycan','Federal Republic','Heydär Äliyev',144,'AZ');

		select t2.Continent, t1.Name, t1.Population from t2 LEFT JOIN t1 ON t2.Code = t1.t2 where t1.Population IN (select max(t1.Population) AS Population from t1, t2 where t1.t2 = t2.Code group by Continent);

		@@ -1526,7 +1526,7 @@ CREATE TABLE t1 (
		) ENGINE=MyISAM;
		INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
		INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
		INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes franaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
		INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes françaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
		INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');
		/!40000 ALTER TABLE t1 ENABLE KEYS /;
		SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);
		@@ -1918,6 +1918,43 @@ SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r

		drop table t1,t2;

		#
		# Bug #21853: assert failure for a grouping query with
		# an ALL/ANY quantified subquery in HAVING
		#

		CREATE TABLE t1 (
		field1 int NOT NULL,
		field2 int NOT NULL,
		field3 int NOT NULL,
		PRIMARY KEY (field1,field2,field3)
		);
		CREATE TABLE t2 (
		fieldA int NOT NULL,
		fieldB int NOT NULL,
		PRIMARY KEY (fieldA,fieldB)
		);

		INSERT INTO t1 VALUES
		(1,1,1), (1,1,2), (1,2,1), (1,2,2), (1,2,3), (1,3,1);
		INSERT INTO t2 VALUES (1,1), (1,2), (1,3);

		SELECT field1, field2, COUNT(*)
		FROM t1 GROUP BY field1, field2;

		SELECT field1, field2
		FROM t1
		GROUP BY field1, field2
		HAVING COUNT(*) >= ALL (SELECT fieldB
		FROM t2 WHERE fieldA = field1);
		SELECT field1, field2
		FROM t1
		GROUP BY field1, field2
		HAVING COUNT(*) < ANY (SELECT fieldB
		FROM t2 WHERE fieldA = field1);

		DROP TABLE t1, t2;

		# End of 4.1 tests

		#

mysql-test/t/view.test

+18 −0

Original line number	Diff line number	Diff line
		@@ -2850,4 +2850,22 @@ EXPLAIN SELECT * FROM v1 t WHERE t.s1+1 < (SELECT MAX(t1.s1) FROM t1);

		DROP VIEW v1;
		DROP TABLE t1;

		#
		# Bug #21646: view qith a subquery in ON expression
		#

		CREATE TABLE t1(pk int PRIMARY KEY);
		CREATE TABLE t2(pk int PRIMARY KEY, fk int, ver int, org int);

		CREATE ALGORITHM=MERGE VIEW v1 AS
		SELECT t1.*
		FROM t1 JOIN t2
		ON t2.fk = t1.pk AND
		t2.ver = (SELECT MAX(t.ver) FROM t2 t WHERE t.org = t2.org);
		SHOW WARNINGS;
		SHOW CREATE VIEW v1;

		DROP VIEW v1;
		DROP TABLE t1, t2;
		--echo End of 5.0 tests.

sql/item.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -1182,6 +1182,7 @@ void Item::split_sum_func2(THD thd, Item *ref_pointer_array,
		split_sum_func(thd, ref_pointer_array, fields);
		}
		else if ((type() == SUM_FUNC_ITEM \|\| (used_tables() & ~PARAM_TABLE_BIT)) &&
		type() != SUBSELECT_ITEM &&
		(type() != REF_ITEM \|\|
		((Item_ref*)this)->ref_type() == Item_ref::VIEW_REF))
		{