Merge rurik.mysql.com:/home/igor/mysql-5.0 (0792cd92) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/func_group.result

+0 −138

Original line number	Diff line number	Diff line
		@@ -821,144 +821,6 @@ SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
		MAX(id)
		NULL
		DROP TABLE t1;
		create table t1m (a int) engine=myisam;
		create table t1i (a int) engine=innodb;
		create table t2m (a int) engine=myisam;
		create table t2i (a int) engine=innodb;
		insert into t2m values (5);
		insert into t2i values (5);
		select min(a) from t1m;
		min(a)
		NULL
		select min(7) from t1m;
		min(7)
		NULL
		select min(7) from DUAL;
		min(7)
		NULL
		explain select min(7) from t2m join t1m;
		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 min(7) from t2m join t1m;
		min(7)
		NULL
		select max(a) from t1m;
		max(a)
		NULL
		select max(7) from t1m;
		max(7)
		NULL
		select max(7) from DUAL;
		max(7)
		NULL
		explain select max(7) from t2m join t1m;
		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(7) from t2m join t1m;
		max(7)
		NULL
		select 1, min(a) from t1m where a=99;
		1 min(a)
		1 NULL
		select 1, min(a) from t1m where 1=99;
		1 min(a)
		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
		select 1, max(a) from t1m where a=99;
		1 max(a)
		1 NULL
		select 1, max(a) from t1m where 1=99;
		1 max(a)
		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
		select min(a) from t1i;
		min(a)
		NULL
		select min(7) from t1i;
		min(7)
		NULL
		select min(7) from DUAL;
		min(7)
		NULL
		explain select min(7) from t2i join t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select min(7) from t2i join t1i;
		min(7)
		NULL
		select max(a) from t1i;
		max(a)
		NULL
		select max(7) from t1i;
		max(7)
		NULL
		select max(7) from DUAL;
		max(7)
		NULL
		explain select max(7) from t2i join t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select max(7) from t2i join t1i;
		max(7)
		NULL
		select 1, min(a) from t1i where a=99;
		1 min(a)
		1 NULL
		select 1, min(a) from t1i where 1=99;
		1 min(a)
		1 NULL
		select 1, min(1) from t1i where a=99;
		1 min(1)
		1 NULL
		select 1, min(1) from t1i where 1=99;
		1 min(1)
		1 NULL
		select 1, max(a) from t1i where a=99;
		1 max(a)
		1 NULL
		select 1, max(a) from t1i where 1=99;
		1 max(a)
		1 NULL
		select 1, max(1) from t1i where a=99;
		1 max(1)
		1 NULL
		select 1, max(1) from t1i where 1=99;
		1 max(1)
		1 NULL
		explain select count(*), min(7), max(7) from t1m, t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t1m, t1i;
		count(*) min(7) max(7)
		0 NULL NULL
		explain select count(*), min(7), max(7) from t1m, t2i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t1m, t2i;
		count(*) min(7) max(7)
		0 NULL NULL
		explain select count(*), min(7), max(7) from t2m, t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2m system NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t2m, t1i;
		count(*) min(7) max(7)
		0 NULL NULL
		drop table t1m, t1i, t2m, t2i;
		create table t2 (ff double);
		insert into t2 values (2.2);
		select cast(sum(distinct ff) as decimal(5,2)) from t2;

mysql-test/r/innodb_mysql.result

+138 −0

Original line number	Diff line number	Diff line
		@@ -54,3 +54,141 @@ c.c_id = 218 and expiredate is null;
		slai_id
		12
		drop table t1, t2;
		create table t1m (a int) engine=myisam;
		create table t1i (a int) engine=innodb;
		create table t2m (a int) engine=myisam;
		create table t2i (a int) engine=innodb;
		insert into t2m values (5);
		insert into t2i values (5);
		select min(a) from t1m;
		min(a)
		NULL
		select min(7) from t1m;
		min(7)
		NULL
		select min(7) from DUAL;
		min(7)
		NULL
		explain select min(7) from t2m join t1m;
		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 min(7) from t2m join t1m;
		min(7)
		NULL
		select max(a) from t1m;
		max(a)
		NULL
		select max(7) from t1m;
		max(7)
		NULL
		select max(7) from DUAL;
		max(7)
		NULL
		explain select max(7) from t2m join t1m;
		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(7) from t2m join t1m;
		max(7)
		NULL
		select 1, min(a) from t1m where a=99;
		1 min(a)
		1 NULL
		select 1, min(a) from t1m where 1=99;
		1 min(a)
		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
		select 1, max(a) from t1m where a=99;
		1 max(a)
		1 NULL
		select 1, max(a) from t1m where 1=99;
		1 max(a)
		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
		select min(a) from t1i;
		min(a)
		NULL
		select min(7) from t1i;
		min(7)
		NULL
		select min(7) from DUAL;
		min(7)
		NULL
		explain select min(7) from t2i join t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select min(7) from t2i join t1i;
		min(7)
		NULL
		select max(a) from t1i;
		max(a)
		NULL
		select max(7) from t1i;
		max(7)
		NULL
		select max(7) from DUAL;
		max(7)
		NULL
		explain select max(7) from t2i join t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select max(7) from t2i join t1i;
		max(7)
		NULL
		select 1, min(a) from t1i where a=99;
		1 min(a)
		1 NULL
		select 1, min(a) from t1i where 1=99;
		1 min(a)
		1 NULL
		select 1, min(1) from t1i where a=99;
		1 min(1)
		1 NULL
		select 1, min(1) from t1i where 1=99;
		1 min(1)
		1 NULL
		select 1, max(a) from t1i where a=99;
		1 max(a)
		1 NULL
		select 1, max(a) from t1i where 1=99;
		1 max(a)
		1 NULL
		select 1, max(1) from t1i where a=99;
		1 max(1)
		1 NULL
		select 1, max(1) from t1i where 1=99;
		1 max(1)
		1 NULL
		explain select count(*), min(7), max(7) from t1m, t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t1m, t1i;
		count(*) min(7) max(7)
		0 NULL NULL
		explain select count(*), min(7), max(7) from t1m, t2i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
		1 SIMPLE t2i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t1m, t2i;
		count(*) min(7) max(7)
		0 NULL NULL
		explain select count(*), min(7), max(7) from t2m, t1i;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2m system NULL NULL NULL NULL 1
		1 SIMPLE t1i ALL NULL NULL NULL NULL 1
		select count(*), min(7), max(7) from t2m, t1i;
		count(*) min(7) max(7)
		0 NULL NULL
		drop table t1m, t1i, t2m, t2i;

mysql-test/r/ndb_blob.result

+66 −0

Original line number	Diff line number	Diff line
		@@ -500,3 +500,69 @@ select count(*) from t1;
		count(*)
		0
		drop table t1;
		create table t1 (
		a varchar(40) not null,
		b mediumint not null,
		t text,
		c varchar(2) not null,
		d bigint not null,
		primary key (a,b,c),
		key (c,a),
		unique key (d)
		) engine=ndb;
		insert into t1 (a,b,c,d,t) values ('a',1110,'a',1,@v1);
		insert into t1 (a,b,c,d,t) values ('b',1110,'a',2,@v2);
		insert into t1 (a,b,c,d,t) values ('a',1110,'b',3,@v3);
		insert into t1 (a,b,c,d,t) values ('b',1110,'b',4,@v4);
		select a,b,c,d,sha1(t) from t1 order by c,a;
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		b 1110 a 2 b238654911689bfb626a3ef9dba4a1ca074e6a5e
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		b 1110 b 4 NULL
		select a,b,c,d,sha1(t) from t1 where a='a' and b=1110 and c='a';
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		select a,b,c,d,sha1(t) from t1 where a='a' and b=1110 and c='b';
		a b c d sha1(t)
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		update t1 set t=@v4 where a='b' and b=1110 and c='a';
		update t1 set t=@v2 where a='b' and b=1110 and c='b';
		select a,b,c,d,sha1(t) from t1 order by c,a;
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		b 1110 a 2 NULL
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		b 1110 b 4 b238654911689bfb626a3ef9dba4a1ca074e6a5e
		update t1 set t=@v2 where d=2;
		update t1 set t=@v4 where d=4;
		select a,b,c,d,sha1(t) from t1 order by c,a;
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		b 1110 a 2 b238654911689bfb626a3ef9dba4a1ca074e6a5e
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		b 1110 b 4 NULL
		update t1 set t=@v4 where a='b' and c='a';
		update t1 set t=@v2 where a='b' and c='b';
		select a,b,c,d,sha1(t) from t1 order by c,a;
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		b 1110 a 2 NULL
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		b 1110 b 4 b238654911689bfb626a3ef9dba4a1ca074e6a5e
		update t1 set t=@v2 where b+d=1112;
		update t1 set t=@v4 where b+d=1114;
		select a,b,c,d,sha1(t) from t1 order by c,a;
		a b c d sha1(t)
		a 1110 a 1 558a30713786aa72f66abc1e6a521d55aacdeeb5
		b 1110 a 2 b238654911689bfb626a3ef9dba4a1ca074e6a5e
		a 1110 b 3 2b6515f29c20b8e9e17cc597527e516c0de8d612
		b 1110 b 4 NULL
		delete from t1 where a='a' and b=1110 and c='a';
		delete from t1 where a='b' and c='a';
		delete from t1 where d=3;
		delete from t1 where b+d=1114;
		select count(*) from t1;
		count(*)
		0
		drop table t1;

mysql-test/t/func_group.test

+0 −71

Original line number	Diff line number	Diff line
		@@ -539,77 +539,6 @@ INSERT INTO t1 VALUES
		SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
		DROP TABLE t1;

		#
		# Bug #12882 min/max inconsistent on empty table
		#

		--disable_warnings
		create table t1m (a int) engine=myisam;
		create table t1i (a int) engine=innodb;
		create table t2m (a int) engine=myisam;
		create table t2i (a int) engine=innodb;
		--enable_warnings
		insert into t2m values (5);
		insert into t2i values (5);

		# test with MyISAM
		select min(a) from t1m;
		select min(7) from t1m;
		select min(7) from DUAL;
		explain select min(7) from t2m join t1m;
		select min(7) from t2m join t1m;

		select max(a) from t1m;
		select max(7) from t1m;
		select max(7) from DUAL;
		explain select max(7) from t2m join t1m;
		select max(7) from t2m join t1m;

		select 1, min(a) from t1m where a=99;
		select 1, min(a) from t1m where 1=99;
		select 1, min(1) from t1m where a=99;
		select 1, min(1) from t1m where 1=99;

		select 1, max(a) from t1m where a=99;
		select 1, max(a) from t1m where 1=99;
		select 1, max(1) from t1m where a=99;
		select 1, max(1) from t1m where 1=99;

		# test with InnoDB
		select min(a) from t1i;
		select min(7) from t1i;
		select min(7) from DUAL;
		explain select min(7) from t2i join t1i;
		select min(7) from t2i join t1i;

		select max(a) from t1i;
		select max(7) from t1i;
		select max(7) from DUAL;
		explain select max(7) from t2i join t1i;
		select max(7) from t2i join t1i;

		select 1, min(a) from t1i where a=99;
		select 1, min(a) from t1i where 1=99;
		select 1, min(1) from t1i where a=99;
		select 1, min(1) from t1i where 1=99;

		select 1, max(a) from t1i where a=99;
		select 1, max(a) from t1i where 1=99;
		select 1, max(1) from t1i where a=99;
		select 1, max(1) from t1i where 1=99;

		# mixed MyISAM/InnoDB test
		explain select count(*), min(7), max(7) from t1m, t1i;
		select count(*), min(7), max(7) from t1m, t1i;

		explain select count(*), min(7), max(7) from t1m, t2i;
		select count(*), min(7), max(7) from t1m, t2i;

		explain select count(*), min(7), max(7) from t2m, t1i;
		select count(*), min(7), max(7) from t2m, t1i;

		drop table t1m, t1i, t2m, t2i;

		# End of 4.1 tests

		#

mysql-test/t/init_connect.test

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		# Test of init_connect variable
		#

		# should work with embedded server after mysqltest is fixed
		-- source include/not_embedded.inc
		connect (con0,localhost,root,,);
		connection con0;
		select hex(@a);