Commit 1dc1ad9c authored by unknown's avatar unknown
Browse files

Bug#6252 - Duplicate columns in keys should fail 

  Added check for duplicate column in key
  Added tests and fixed tests which exploit bug


mysql-test/r/delete.result:
  Fix test as it exploited Bug#6252
mysql-test/r/innodb.result:
  Test for Bug#6126
mysql-test/r/key.result:
  Test for Bug#6126/6252
mysql-test/r/type_blob.result:
  Fix test as it exploited Bug#6252
mysql-test/t/delete.test:
  Fix test as it exploited Bug#6252
mysql-test/t/innodb.test:
  Test for Bug#6126
mysql-test/t/key.test:
  Test for Bug#6126/6252
mysql-test/t/type_blob.test:
  Fix test as it exploited Bug#6252
sql/sql_table.cc:
  Bug#6252 - Duplicate columns in keys should fail
    Added check for duplicate column.
parent 12c0a342

mysql-test/r/delete.result

+26 −4
Original line number Diff line number Diff line
@@ -16,12 +16,34 @@ SET AUTOCOMMIT=0; 
DELETE from t1;

SET AUTOCOMMIT=1;

drop table t1;

create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));

insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23);

create table t1 (

a bigint not null,

b bigint not null default 0,

c bigint not null default 0,

d bigint not null default 0,

e bigint not null default 0,

f bigint not null default 0,

g bigint not null default 0,

h bigint not null default 0,

i bigint not null default 0,

j bigint not null default 0,

primary key (a,b,c,d,e,f,g,h,i,j));

insert into t1 (a) values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23);

delete from t1 where a=26;

drop table t1;

create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));

insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);

create table t1 (

a bigint not null,

b bigint not null default 0,

c bigint not null default 0,

d bigint not null default 0,

e bigint not null default 0,

f bigint not null default 0,

g bigint not null default 0,

h bigint not null default 0,

i bigint not null default 0,

j bigint not null default 0,

primary key (a,b,c,d,e,f,g,h,i,j));

insert into t1 (a) values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);

delete from t1 where a=27;

drop table t1;

CREATE TABLE `t1` (

mysql-test/r/innodb.result

+18 −0
Original line number Diff line number Diff line
@@ -1630,3 +1630,21 @@ show status like "binlog_cache_disk_use"; 
Variable_name	Value

Binlog_cache_disk_use	1

drop table t1;

create table t1 (c char(10), index (c,c)) engine=innodb;

ERROR 42S21: Duplicate column name 'c'

create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1)) engine=innodb;

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10), index (c1,c1,c2)) engine=innodb;

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10), index (c2,c1,c1)) engine=innodb;

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10)) engine=innodb;

alter table t1 add key (c1,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c2,c1,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c1,c2,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c1,c1,c2);

ERROR 42S21: Duplicate column name 'c1'

drop table t1;

mysql-test/r/key.result

+18 −0
Original line number Diff line number Diff line
@@ -307,3 +307,21 @@ test.t1 check status OK 
drop table t1;

create table t1 (c char(10), index (c(0)));

ERROR HY000: Key part 'c' length cannot be 0

create table t1 (c char(10), index (c,c));

ERROR 42S21: Duplicate column name 'c'

create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1));

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10), index (c1,c1,c2));

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10), index (c2,c1,c1));

ERROR 42S21: Duplicate column name 'c1'

create table t1 (c1 char(10), c2 char(10));

alter table t1 add key (c1,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c2,c1,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c1,c2,c1);

ERROR 42S21: Duplicate column name 'c1'

alter table t1 add key (c1,c1,c2);

ERROR 42S21: Duplicate column name 'c1'

drop table t1;

mysql-test/r/type_blob.result

+2 −2
Original line number Diff line number Diff line
@@ -682,8 +682,8 @@ id txt 
3	NULL

1	Chevy

drop table t1;

CREATE TABLE t1 ( i int(11) NOT NULL default '0',    c text NOT NULL, PRIMARY KEY  (i), KEY (c(1),c(1)));

INSERT t1 VALUES (1,''),(2,''),(3,'asdfh'),(4,'');

CREATE TABLE t1 ( i int(11) NOT NULL default '0',    c text NOT NULL, d varchar(1) NOT NULL DEFAULT ' ', PRIMARY KEY  (i), KEY (c(1),d));

INSERT t1 (i, c) VALUES (1,''),(2,''),(3,'asdfh'),(4,'');

select max(i) from t1 where c = '';

max(i)

4

mysql-test/t/delete.test

+26 −4
Original line number Diff line number Diff line
@@ -29,12 +29,34 @@ drop table t1; 
# (This assumes a block size of 1024)

#



create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));

insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23);

create table t1 (

	a bigint not null,

	b bigint not null default 0,

	c bigint not null default 0,

	d bigint not null default 0,

	e bigint not null default 0,

	f bigint not null default 0,

	g bigint not null default 0,

	h bigint not null default 0,

	i bigint not null default 0,

	j bigint not null default 0,

	primary key (a,b,c,d,e,f,g,h,i,j));

insert into t1 (a) values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23);

delete from t1 where a=26;

drop table t1;

create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));

insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);

create table t1 (

	a bigint not null,

	b bigint not null default 0,

	c bigint not null default 0,

	d bigint not null default 0,

	e bigint not null default 0,

	f bigint not null default 0,

	g bigint not null default 0,

	h bigint not null default 0,

	i bigint not null default 0,

	j bigint not null default 0,

	primary key (a,b,c,d,e,f,g,h,i,j));

insert into t1 (a) values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);

delete from t1 where a=27;

drop table t1;