Commit 10f72d63 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kgeorge/mysql/5.0/clean 

into  mysql.com:/home/kgeorge/mysql/5.0/B18742-2
parents e61eb742 357eac27

mysql-test/r/group_min_max.result

+1 −40
Original line number Diff line number Diff line
@@ -1981,46 +1981,7 @@ a 
b

c

d

create table t4 (

pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

) engine=innodb;

insert into t4 (a1, a2, b, c, d, dummy) select * from t1;

create index idx12672_0 on t4 (a1);

create index idx12672_1 on t4 (a1,a2,b,c);

create index idx12672_2 on t4 (a1,a2,b);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

select distinct a1 from t4 where pk_col not in (1,2,3,4);

a1

a

b

c

d

drop table t1,t2,t3,t4;

create table t1 (

a varchar(30), b varchar(30), primary key(a), key(b)

) engine=innodb;

select distinct a from t1;

a

drop table t1;

create table t1(a int, key(a)) engine=innodb;

insert into t1 values(1);

select a, count(a) from t1 group by a with rollup;

a	count(a)

1	1

NULL	1

drop table t1;

create table t1 (f1 int, f2 char(1), primary key(f1,f2)) engine=innodb;

insert into t1 values ( 1,"e"),(2,"a"),( 3,"c"),(4,"d");

alter table t1 drop primary key, add primary key (f2, f1);

explain select distinct f1 a, f1 b from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	5	NULL	4	Using index; Using temporary

explain select distinct f1, f2 from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	3	Using index for group-by; Using temporary

drop table t1;

drop table t1,t2,t3;

create table t1 (c1 int not null,c2 int not null, primary key(c1,c2));

insert into t1 (c1,c2) values

(10,1),(10,2),(10,3),(20,4),(20,5),(20,6),(30,7),(30,8),(30,9);

mysql-test/r/innodb_mysql.result

+76 −0
Original line number Diff line number Diff line
@@ -192,3 +192,79 @@ 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 t1 (

a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

);

insert into t1 (a1, a2, b, c, d) values

('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),

('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),

('a','b','a','i121','xy1'),('a','b','a','j121','xy2'),('a','b','a','k121','xy3'),('a','b','a','l121','xy4'),

('a','b','b','m122','xy1'),('a','b','b','n122','xy2'),('a','b','b','o122','xy3'),('a','b','b','p122','xy4'),

('b','a','a','a211','xy1'),('b','a','a','b211','xy2'),('b','a','a','c211','xy3'),('b','a','a','d211','xy4'),

('b','a','b','e212','xy1'),('b','a','b','f212','xy2'),('b','a','b','g212','xy3'),('b','a','b','h212','xy4'),

('b','b','a','i221','xy1'),('b','b','a','j221','xy2'),('b','b','a','k221','xy3'),('b','b','a','l221','xy4'),

('b','b','b','m222','xy1'),('b','b','b','n222','xy2'),('b','b','b','o222','xy3'),('b','b','b','p222','xy4'),

('c','a','a','a311','xy1'),('c','a','a','b311','xy2'),('c','a','a','c311','xy3'),('c','a','a','d311','xy4'),

('c','a','b','e312','xy1'),('c','a','b','f312','xy2'),('c','a','b','g312','xy3'),('c','a','b','h312','xy4'),

('c','b','a','i321','xy1'),('c','b','a','j321','xy2'),('c','b','a','k321','xy3'),('c','b','a','l321','xy4'),

('c','b','b','m322','xy1'),('c','b','b','n322','xy2'),('c','b','b','o322','xy3'),('c','b','b','p322','xy4'),

('d','a','a','a411','xy1'),('d','a','a','b411','xy2'),('d','a','a','c411','xy3'),('d','a','a','d411','xy4'),

('d','a','b','e412','xy1'),('d','a','b','f412','xy2'),('d','a','b','g412','xy3'),('d','a','b','h412','xy4'),

('d','b','a','i421','xy1'),('d','b','a','j421','xy2'),('d','b','a','k421','xy3'),('d','b','a','l421','xy4'),

('d','b','b','m422','xy1'),('d','b','b','n422','xy2'),('d','b','b','o422','xy3'),('d','b','b','p422','xy4'),

('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),

('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),

('a','b','a','i121','xy1'),('a','b','a','j121','xy2'),('a','b','a','k121','xy3'),('a','b','a','l121','xy4'),

('a','b','b','m122','xy1'),('a','b','b','n122','xy2'),('a','b','b','o122','xy3'),('a','b','b','p122','xy4'),

('b','a','a','a211','xy1'),('b','a','a','b211','xy2'),('b','a','a','c211','xy3'),('b','a','a','d211','xy4'),

('b','a','b','e212','xy1'),('b','a','b','f212','xy2'),('b','a','b','g212','xy3'),('b','a','b','h212','xy4'),

('b','b','a','i221','xy1'),('b','b','a','j221','xy2'),('b','b','a','k221','xy3'),('b','b','a','l221','xy4'),

('b','b','b','m222','xy1'),('b','b','b','n222','xy2'),('b','b','b','o222','xy3'),('b','b','b','p222','xy4'),

('c','a','a','a311','xy1'),('c','a','a','b311','xy2'),('c','a','a','c311','xy3'),('c','a','a','d311','xy4'),

('c','a','b','e312','xy1'),('c','a','b','f312','xy2'),('c','a','b','g312','xy3'),('c','a','b','h312','xy4'),

('c','b','a','i321','xy1'),('c','b','a','j321','xy2'),('c','b','a','k321','xy3'),('c','b','a','l321','xy4'),

('c','b','b','m322','xy1'),('c','b','b','n322','xy2'),('c','b','b','o322','xy3'),('c','b','b','p322','xy4'),

('d','a','a','a411','xy1'),('d','a','a','b411','xy2'),('d','a','a','c411','xy3'),('d','a','a','d411','xy4'),

('d','a','b','e412','xy1'),('d','a','b','f412','xy2'),('d','a','b','g412','xy3'),('d','a','b','h412','xy4'),

('d','b','a','i421','xy1'),('d','b','a','j421','xy2'),('d','b','a','k421','xy3'),('d','b','a','l421','xy4'),

('d','b','b','m422','xy1'),('d','b','b','n422','xy2'),('d','b','b','o422','xy3'),('d','b','b','p422','xy4');

create table t4 (

pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

) engine=innodb;

insert into t4 (a1, a2, b, c, d, dummy) select * from t1;

create index idx12672_0 on t4 (a1);

create index idx12672_1 on t4 (a1,a2,b,c);

create index idx12672_2 on t4 (a1,a2,b);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

select distinct a1 from t4 where pk_col not in (1,2,3,4);

a1

a

b

c

d

drop table t1,t4;

create table t1 (

a varchar(30), b varchar(30), primary key(a), key(b)

) engine=innodb;

select distinct a from t1;

a

drop table t1;

create table t1(a int, key(a)) engine=innodb;

insert into t1 values(1);

select a, count(a) from t1 group by a with rollup;

a	count(a)

1	1

NULL	1

drop table t1;

create table t1 (f1 int, f2 char(1), primary key(f1,f2)) engine=innodb;

insert into t1 values ( 1,"e"),(2,"a"),( 3,"c"),(4,"d");

alter table t1 drop primary key, add primary key (f2, f1);

explain select distinct f1 a, f1 b from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	5	NULL	4	Using index; Using temporary

explain select distinct f1, f2 from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	3	Using index for group-by; Using temporary

drop table t1;

mysql-test/t/group_min_max.test

+1 −53
Original line number Diff line number Diff line
@@ -659,59 +659,7 @@ select a1 from t1 where a2 = 'b' group by a1; 
explain select distinct a1 from t1 where a2 = 'b';

select distinct a1 from t1 where a2 = 'b';



#

# Bug #12672: primary key implcitly included in every innodb index

#



--disable_warnings

create table t4 (

  pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

) engine=innodb;

--enable_warnings

insert into t4 (a1, a2, b, c, d, dummy) select * from t1;



create index idx12672_0 on t4 (a1);

create index idx12672_1 on t4 (a1,a2,b,c);

create index idx12672_2 on t4 (a1,a2,b);

analyze table t1;



select distinct a1 from t4 where pk_col not in (1,2,3,4);



drop table t1,t2,t3,t4;



#

# Bug #6142: a problem with the empty innodb table

#



--disable_warnings

create table t1 (

  a varchar(30), b varchar(30), primary key(a), key(b)

) engine=innodb;

--enable_warnings

select distinct a from t1;

drop table t1;



#

# Bug #9798: group by with rollup

#



--disable_warnings

create table t1(a int, key(a)) engine=innodb;

--enable_warnings

insert into t1 values(1);

select a, count(a) from t1 group by a with rollup;

drop table t1;



#

# Bug #13293 Wrongly used index results in endless loop.

#

create table t1 (f1 int, f2 char(1), primary key(f1,f2)) engine=innodb;

insert into t1 values ( 1,"e"),(2,"a"),( 3,"c"),(4,"d");

alter table t1 drop primary key, add primary key (f2, f1);

explain select distinct f1 a, f1 b from t1;

explain select distinct f1, f2 from t1;

drop table t1;



drop table t1,t2,t3;

#

# Bug #14920 Ordering aggregated result sets with composite primary keys

# corrupts resultset

mysql-test/t/innodb_mysql.test

+94 −0
Original line number Diff line number Diff line
@@ -129,3 +129,97 @@ select count(*), min(7), max(7) from t2m, t1i; 


drop table t1m, t1i, t2m, t2i;



#

# Bug #12672: primary key implcitly included in every innodb index 

# (was part of group_min_max.test)

#



create table t1 (

  a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

);



insert into t1 (a1, a2, b, c, d) values

('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),

('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),

('a','b','a','i121','xy1'),('a','b','a','j121','xy2'),('a','b','a','k121','xy3'),('a','b','a','l121','xy4'),

('a','b','b','m122','xy1'),('a','b','b','n122','xy2'),('a','b','b','o122','xy3'),('a','b','b','p122','xy4'),

('b','a','a','a211','xy1'),('b','a','a','b211','xy2'),('b','a','a','c211','xy3'),('b','a','a','d211','xy4'),

('b','a','b','e212','xy1'),('b','a','b','f212','xy2'),('b','a','b','g212','xy3'),('b','a','b','h212','xy4'),

('b','b','a','i221','xy1'),('b','b','a','j221','xy2'),('b','b','a','k221','xy3'),('b','b','a','l221','xy4'),

('b','b','b','m222','xy1'),('b','b','b','n222','xy2'),('b','b','b','o222','xy3'),('b','b','b','p222','xy4'),

('c','a','a','a311','xy1'),('c','a','a','b311','xy2'),('c','a','a','c311','xy3'),('c','a','a','d311','xy4'),

('c','a','b','e312','xy1'),('c','a','b','f312','xy2'),('c','a','b','g312','xy3'),('c','a','b','h312','xy4'),

('c','b','a','i321','xy1'),('c','b','a','j321','xy2'),('c','b','a','k321','xy3'),('c','b','a','l321','xy4'),

('c','b','b','m322','xy1'),('c','b','b','n322','xy2'),('c','b','b','o322','xy3'),('c','b','b','p322','xy4'),

('d','a','a','a411','xy1'),('d','a','a','b411','xy2'),('d','a','a','c411','xy3'),('d','a','a','d411','xy4'),

('d','a','b','e412','xy1'),('d','a','b','f412','xy2'),('d','a','b','g412','xy3'),('d','a','b','h412','xy4'),

('d','b','a','i421','xy1'),('d','b','a','j421','xy2'),('d','b','a','k421','xy3'),('d','b','a','l421','xy4'),

('d','b','b','m422','xy1'),('d','b','b','n422','xy2'),('d','b','b','o422','xy3'),('d','b','b','p422','xy4'),

('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),

('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),

('a','b','a','i121','xy1'),('a','b','a','j121','xy2'),('a','b','a','k121','xy3'),('a','b','a','l121','xy4'),

('a','b','b','m122','xy1'),('a','b','b','n122','xy2'),('a','b','b','o122','xy3'),('a','b','b','p122','xy4'),

('b','a','a','a211','xy1'),('b','a','a','b211','xy2'),('b','a','a','c211','xy3'),('b','a','a','d211','xy4'),

('b','a','b','e212','xy1'),('b','a','b','f212','xy2'),('b','a','b','g212','xy3'),('b','a','b','h212','xy4'),

('b','b','a','i221','xy1'),('b','b','a','j221','xy2'),('b','b','a','k221','xy3'),('b','b','a','l221','xy4'),

('b','b','b','m222','xy1'),('b','b','b','n222','xy2'),('b','b','b','o222','xy3'),('b','b','b','p222','xy4'),

('c','a','a','a311','xy1'),('c','a','a','b311','xy2'),('c','a','a','c311','xy3'),('c','a','a','d311','xy4'),

('c','a','b','e312','xy1'),('c','a','b','f312','xy2'),('c','a','b','g312','xy3'),('c','a','b','h312','xy4'),

('c','b','a','i321','xy1'),('c','b','a','j321','xy2'),('c','b','a','k321','xy3'),('c','b','a','l321','xy4'),

('c','b','b','m322','xy1'),('c','b','b','n322','xy2'),('c','b','b','o322','xy3'),('c','b','b','p322','xy4'),

('d','a','a','a411','xy1'),('d','a','a','b411','xy2'),('d','a','a','c411','xy3'),('d','a','a','d411','xy4'),

('d','a','b','e412','xy1'),('d','a','b','f412','xy2'),('d','a','b','g412','xy3'),('d','a','b','h412','xy4'),

('d','b','a','i421','xy1'),('d','b','a','j421','xy2'),('d','b','a','k421','xy3'),('d','b','a','l421','xy4'),

('d','b','b','m422','xy1'),('d','b','b','n422','xy2'),('d','b','b','o422','xy3'),('d','b','b','p422','xy4');

--disable_warnings

create table t4 (

  pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '

) engine=innodb;

--enable_warnings

insert into t4 (a1, a2, b, c, d, dummy) select * from t1;



create index idx12672_0 on t4 (a1);

create index idx12672_1 on t4 (a1,a2,b,c);

create index idx12672_2 on t4 (a1,a2,b);

analyze table t1;



select distinct a1 from t4 where pk_col not in (1,2,3,4);



drop table t1,t4;



#

# Bug #6142: a problem with the empty innodb table 

# (was part of group_min_max.test)

#



--disable_warnings

create table t1 (

  a varchar(30), b varchar(30), primary key(a), key(b)

) engine=innodb;

--enable_warnings

select distinct a from t1;

drop table t1;



#

# Bug #9798: group by with rollup 

# (was part of group_min_max.test)

#



--disable_warnings

create table t1(a int, key(a)) engine=innodb;

--enable_warnings

insert into t1 values(1);

select a, count(a) from t1 group by a with rollup;

drop table t1;



#

# Bug #13293 Wrongly used index results in endless loop.  

# (was part of group_min_max.test)

#

create table t1 (f1 int, f2 char(1), primary key(f1,f2)) engine=innodb;

insert into t1 values ( 1,"e"),(2,"a"),( 3,"c"),(4,"d");

alter table t1 drop primary key, add primary key (f2, f1);

explain select distinct f1 a, f1 b from t1;

explain select distinct f1, f2 from t1;

drop table t1;