Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 (d31ae636) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/func_group.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -824,6 +824,7 @@ select 1, min(a) from t1m where 1=99;
		1 NULL
		select 1, min(1) from t1m where a=99;
		1 min(1)
		1 NULL
		select 1, min(1) from t1m where 1=99;
		1 min(1)
		1 NULL
		@@ -835,6 +836,7 @@ select 1, max(a) from t1m where 1=99;
		1 NULL
		select 1, max(1) from t1m where a=99;
		1 max(1)
		1 NULL
		select 1, max(1) from t1m where 1=99;
		1 max(1)
		1 NULL

mysql-test/r/func_str.result

+28 −0

Original line number	Diff line number	Diff line
		@@ -1036,4 +1036,32 @@ a c
		abc abc abc
		xyz xyz xyz
		DROP TABLE t1;
		CREATE TABLE t1 (s varchar(10));
		INSERT INTO t1 VALUES ('yadda'), ('yaddy');
		EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(s) > 'ab';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
		Warnings:
		Note 1003 select test.t1.s AS `s` from test.t1 where (trim(test.t1.s) > _latin1'ab')
		EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM('y' FROM s) > 'ab';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
		Warnings:
		Note 1003 select test.t1.s AS `s` from test.t1 where (trim(both _latin1'y' from test.t1.s) > _latin1'ab')
		EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(LEADING 'y' FROM s) > 'ab';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
		Warnings:
		Note 1003 select test.t1.s AS `s` from test.t1 where (trim(leading _latin1'y' from test.t1.s) > _latin1'ab')
		EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(TRAILING 'y' FROM s) > 'ab';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
		Warnings:
		Note 1003 select test.t1.s AS `s` from test.t1 where (trim(trailing _latin1'y' from test.t1.s) > _latin1'ab')
		EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(BOTH 'y' FROM s) > 'ab';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
		Warnings:
		Note 1003 select test.t1.s AS `s` from test.t1 where (trim(both _latin1'y' from test.t1.s) > _latin1'ab')
		DROP TABLE t1;
		End of 4.1 tests

mysql-test/r/select.result

+75 −0

Original line number	Diff line number	Diff line
		@@ -2744,3 +2744,78 @@ SELECT i='1e+01',i=1e+01, i in (1e+01), i in ('1e+01') FROM t1;
		i='1e+01' i=1e+01 i in (1e+01) i in ('1e+01')
		0 1 1 1
		DROP TABLE t1;
		CREATE TABLE t1 (a int, b int);
		INSERT INTO t1 VALUES (1,1), (2,1), (4,10);
		CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));
		INSERT INTO t2 VALUES (1,NULL), (2,10);
		ALTER TABLE t1 ENABLE KEYS;
		EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 index b b 5 NULL 2 Using index
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
		SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
		a b a b
		1 NULL 1 1
		1 NULL 2 1
		1 NULL 4 10
		2 10 4 10
		EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 index b b 5 NULL 2 Using index
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
		SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
		a b a b
		1 NULL 1 1
		1 NULL 2 1
		1 NULL 4 10
		2 10 4 10
		DROP TABLE IF EXISTS t1,t2;
		CREATE TABLE t1 (key1 float default NULL, UNIQUE KEY key1 (key1));
		CREATE TABLE t2 (key2 float default NULL, UNIQUE KEY key2 (key2));
		INSERT INTO t1 VALUES (0.3762),(0.3845),(0.6158),(0.7941);
		INSERT INTO t2 VALUES (1.3762),(1.3845),(1.6158),(1.7941);
		explain select max(key1) from t1 where key1 <= 0.6158;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select max(key2) from t2 where key2 <= 1.6158;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select min(key1) from t1 where key1 >= 0.3762;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select min(key2) from t2 where key2 >= 1.3762;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select max(key1), min(key2) from t1, t2
		where key1 <= 0.6158 and key2 >= 1.3762;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		explain select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		select max(key1) from t1 where key1 <= 0.6158;
		max(key1)
		0.61580002307892
		select max(key2) from t2 where key2 <= 1.6158;
		max(key2)
		1.6158000230789
		select min(key1) from t1 where key1 >= 0.3762;
		min(key1)
		0.37619999051094
		select min(key2) from t2 where key2 >= 1.3762;
		min(key2)
		1.3761999607086
		select max(key1), min(key2) from t1, t2
		where key1 <= 0.6158 and key2 >= 1.3762;
		max(key1) min(key2)
		0.61580002307892 1.3761999607086
		select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;
		max(key1)
		0.61580002307892
		select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
		min(key1)
		0.37619999051094
		DROP TABLE t1,t2;

mysql-test/r/subselect.result

+28 −1

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
		Warnings:
		Note 1003 select max(test.t1.numreponse) AS `MAX(numreponse)` from test.t1 where (test.t1.numeropost = _latin1'1')
		Note 1003 select max(test.t1.numreponse) AS `MAX(numreponse)` from test.t1
		EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT MAX(numreponse) FROM t1 WHERE numeropost='1');
		id select_type table type possible_keys key key_len ref rows Extra
		1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 Using index
		@@ -2868,3 +2868,30 @@ select 1 from dual where 1 < any (select 2 from dual);
		select 1 from dual where 1 < all (select 2 from dual where 1!=1);
		1
		1
		create table t1 (s1 char);
		insert into t1 values (1),(2);
		select * from t1 where (s1 < any (select s1 from t1));
		s1
		1
		select * from t1 where not (s1 < any (select s1 from t1));
		s1
		2
		select * from t1 where (s1 < ALL (select s1+1 from t1));
		s1
		1
		select * from t1 where not(s1 < ALL (select s1+1 from t1));
		s1
		2
		select * from t1 where (s1+1 = ANY (select s1 from t1));
		s1
		1
		select * from t1 where NOT(s1+1 = ANY (select s1 from t1));
		s1
		2
		select * from t1 where (s1 = ALL (select s1/s1 from t1));
		s1
		1
		select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
		s1
		2
		drop table t1;

mysql-test/r/subselect2.result

+12 −0

Original line number	Diff line number	Diff line
		@@ -130,3 +130,15 @@ id select_type table type possible_keys key key_len ref rows Extra
		5 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX PRIMARY 32 func 1 Using index; Using where
		6 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX PRIMARY 32 func 1 Using index; Using where
		drop table t1, t2, t3, t4;
		CREATE TABLE t1 (a int(10) , PRIMARY KEY (a)) Engine=InnoDB;
		INSERT INTO t1 VALUES (1),(2);
		CREATE TABLE t2 (a int(10), PRIMARY KEY (a)) Engine=InnoDB;
		INSERT INTO t2 VALUES (1);
		CREATE TABLE t3 (a int(10), b int(10), c int(10),
		PRIMARY KEY (a)) Engine=InnoDB;
		INSERT INTO t3 VALUES (1,2,1);
		SELECT t1.* FROM t1 WHERE (SELECT COUNT(*) FROM t3,t2 WHERE t3.c=t2.a
		and t2.a='1' AND t1.a=t3.b) > 0;
		a
		2
		DROP TABLE t1,t2,t3;