Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 (b339b30c) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/create.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -447,8 +447,8 @@ t2 CREATE TABLE `t2` (
		`ifnull(c,c)` mediumint(8) default NULL,
		`ifnull(d,d)` int(11) default NULL,
		`ifnull(e,e)` bigint(20) default NULL,
		`ifnull(f,f)` float(24,2) default NULL,
		`ifnull(g,g)` double(53,3) default NULL,
		`ifnull(f,f)` float(3,2) default NULL,
		`ifnull(g,g)` double(4,3) default NULL,
		`ifnull(h,h)` decimal(5,4) default NULL,
		`ifnull(i,i)` year(4) default NULL,
		`ifnull(j,j)` date default NULL,

mysql-test/r/func_in.result

+5 −0

Original line number	Diff line number	Diff line
		@@ -470,4 +470,9 @@ a
		Warnings:
		Warning 1292 Incorrect date value: '19772-07-29' for column 'a' at row 1
		DROP TABLE t1,t2,t3,t4;
		CREATE TABLE t1 (id int not null);
		INSERT INTO t1 VALUES (1),(2);
		SELECT id FROM t1 WHERE id IN(4564, (SELECT IF(1=0,1,1/0)) );
		id
		DROP TABLE t1;
		End of 5.0 tests

mysql-test/r/insert_select.result

+29 −0

Original line number	Diff line number	Diff line
		@@ -744,3 +744,32 @@ f1 f2
		2 2
		10 10
		DROP TABLE t1, t2;
		SET SQL_MODE='STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';
		CREATE TABLE t1 (c VARCHAR(30), INDEX ix_c (c(10)));
		CREATE TABLE t2 (d VARCHAR(10));
		INSERT INTO t1 (c) VALUES ('7_chars'), ('13_characters');
		EXPLAIN
		SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 PRIMARY t1 ALL NULL NULL NULL NULL 2
		2 SUBQUERY t1 ref ix_c ix_c 13 const 1 Using where
		SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;
		(SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters')
		13
		13
		INSERT INTO t2 (d)
		SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;
		INSERT INTO t2 (d)
		SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='7_chars') FROM t1;
		INSERT INTO t2 (d)
		SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c IN (SELECT t1.c FROM t1))
		FROM t1;
		SELECT * FROM t2;
		d
		13
		13
		7
		7
		20
		20
		DROP TABLE t1,t2;

mysql-test/r/subselect.result

+25 −0

Original line number	Diff line number	Diff line
		@@ -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;

mysql-test/r/subselect3.result

+53 −0

Original line number	Diff line number	Diff line
		@@ -645,3 +645,56 @@ a b Z
		2 2 0
		3 3 1
		drop table t1,t2;
		CREATE TABLE t1 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
		INSERT INTO t1 VALUES (1,1,'a'), (1,2,'b'), (1,3,'c'), (1,4,'d'), (1,5,'e'),
		(2,1,'f'), (2,2,'g'), (2,3,'h'), (3,4,'i'),(3,3,'j'), (3,2,'k'), (3,1,'l'),
		(1,9,'m');
		CREATE TABLE t2 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
		INSERT INTO t2 SELECT * FROM t1;
		SELECT a, MAX(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b))
		as test FROM t1 GROUP BY a;
		a MAX(b) test
		1 9 m
		2 3 h
		3 4 i
		SELECT * FROM t1 GROUP by t1.a
		HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c
		HAVING MAX(t2.b+t1.a) < 10));
		a b c
		SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))
		AS test FROM t1 GROUP BY a;
		a AVG(b) test
		1 4.0000 NULL
		2 2.0000 k
		3 2.5000 NULL
		SELECT a,b,c FROM t1 WHERE b in (9,3,4) ORDER BY b,c;
		a b c
		1 3 c
		2 3 h
		3 3 j
		1 4 d
		3 4 i
		1 9 m
		SELECT a, MAX(b),
		(SELECT COUNT(DISTINCT t.c) FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b)
		LIMIT 1)
		as cnt,
		(SELECT t.b FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1)
		as t_b,
		(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1)
		as t_b,
		(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) ORDER BY t.c LIMIT 1)
		as t_b
		FROM t1 GROUP BY a;
		a MAX(b) cnt t_b t_b t_b
		1 9 1 9 m m
		2 3 1 3 h h
		3 4 1 4 i i
		SELECT a, MAX(b),
		(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) as test
		FROM t1 GROUP BY a;
		a MAX(b) test
		1 9 m
		2 3 h
		3 4 i
		DROP TABLE t1, t2;