Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt (c689d424) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ctype_ucs.result

+21 −0

Original line number	Diff line number	Diff line
		@@ -755,6 +755,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536;
		export_set(5, name, upper(name), ",", 5)
		test1,TEST1,test1,TEST1,TEST1
		'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'
		CREATE TABLE t1 (
		status enum('active','passive') collate latin1_general_ci
		NOT NULL default 'passive'
		);
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`status` enum('active','passive') character set latin1 collate latin1_general_ci NOT NULL default 'passive'
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		ALTER TABLE t1 ADD a int NOT NULL AFTER status;
		CREATE TABLE t2 (
		status enum('active','passive') collate ucs2_turkish_ci
		NOT NULL default 'passive'
		);
		SHOW CREATE TABLE t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		`status` enum('active','passive') character set ucs2 collate ucs2_turkish_ci NOT NULL default 'passive'
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		ALTER TABLE t2 ADD a int NOT NULL AFTER status;
		DROP TABLE t1,t2;
		select password(name) from bug20536;
		password(name)
		????????????????????

mysql-test/r/func_gconcat.result

+9 −0

Original line number	Diff line number	Diff line
		@@ -660,3 +660,12 @@ CHAR_LENGTH( GROUP_CONCAT(b) )
		240001
		SET GROUP_CONCAT_MAX_LEN = 1024;
		DROP TABLE t1;
		CREATE TABLE t1 (a int, b int);
		INSERT INTO t1 VALUES (2,1), (1,2), (2,2), (1,3);
		SELECT GROUP_CONCAT(a), x
		FROM (SELECT a, GROUP_CONCAT(b) x FROM t1 GROUP BY a) AS s
		GROUP BY x;
		GROUP_CONCAT(a) x
		2 1,2
		1 2,3
		DROP TABLE t1;

mysql-test/r/func_group.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -851,8 +851,8 @@ CREATE TABLE t1 (a INT, b INT);
		INSERT INTO t1 VALUES (1,1),(1,2),(2,3);
		SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;
		(SELECT COUNT(DISTINCT t1.b))
		0
		2
		1
		SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;
		(SELECT COUNT(DISTINCT 12))
		1
		@@ -1004,7 +1004,7 @@ SELECT SQL_NO_CACHE
		WHERE ttt.a = ccc.b AND ttt.a = t.a GROUP BY ttt.a) AS minid
		FROM t1 t, t2 c WHERE t.a = c.b;
		minid
		NULL
		1
		DROP TABLE t1,t2;
		create table t1 select variance(0);
		show create table t1;

mysql-test/r/group_by.result

+0 −9

Original line number	Diff line number	Diff line
		@@ -821,12 +821,3 @@ a b real_b
		68 France France
		DROP VIEW v1;
		DROP TABLE t1,t2;
		CREATE TABLE t1 (a INT, b INT, KEY(a));
		INSERT INTO t1 VALUES (1, 1), (2, 2), (3,3), (4,4);
		EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 index NULL a 5 NULL 4
		EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using temporary; Using filesort
		DROP TABLE t1;

mysql-test/r/subselect.result

+99 −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);
		@@ -3422,3 +3458,64 @@ id select_type table type possible_keys key key_len ref rows Extra
		4 UNION t12 system NULL NULL NULL NULL 0 const row not found
		NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL
		DROP TABLE t1;
		CREATE TABLE t1 (a INT, b INT);
		CREATE TABLE t2 (a INT);
		INSERT INTO t2 values (1);
		INSERT INTO t1 VALUES (1,1),(1,2),(2,3),(3,4);
		SELECT (SELECT COUNT(DISTINCT t1.b) from t2) FROM t1 GROUP BY t1.a;
		(SELECT COUNT(DISTINCT t1.b) from t2)
		2
		1
		1
		SELECT (SELECT COUNT(DISTINCT t1.b) from t2 union select 1 from t2 where 12 < 3)
		FROM t1 GROUP BY t1.a;
		(SELECT COUNT(DISTINCT t1.b) from t2 union select 1 from t2 where 12 < 3)
		2
		1
		1
		SELECT COUNT(DISTINCT t1.b), (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;
		COUNT(DISTINCT t1.b) (SELECT COUNT(DISTINCT t1.b))
		2 2
		1 1
		1 1
		SELECT COUNT(DISTINCT t1.b),
		(SELECT COUNT(DISTINCT t1.b) union select 1 from DUAL where 12 < 3)
		FROM t1 GROUP BY t1.a;
		COUNT(DISTINCT t1.b) (SELECT COUNT(DISTINCT t1.b) union select 1 from DUAL where 12 < 3)
		2 2
		1 1
		1 1
		SELECT (
		SELECT (
		SELECT COUNT(DISTINCT t1.b)
		)
		)
		FROM t1 GROUP BY t1.a;
		(
		SELECT (
		SELECT COUNT(DISTINCT t1.b)
		)
		)
		2
		1
		1
		SELECT (
		SELECT (
		SELECT (
		SELECT COUNT(DISTINCT t1.b)
		)
		)
		FROM t1 GROUP BY t1.a LIMIT 1)
		FROM t1 t2
		GROUP BY t2.a;
		(
		SELECT (
		SELECT (
		SELECT COUNT(DISTINCT t1.b)
		)
		)
		FROM t1 GROUP BY t1.a LIMIT 1)
		2
		2
		2
		DROP TABLE t1,t2;