diff options
| author | evgen@moonbone.local <> | 2006-06-23 14:53:41 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-06-23 14:53:41 +0400 |
| commit | 9a9224da681dcbce7cfc34593e5b0c8db44900e2 (patch) | |
| tree | 17b57202e437e09d93179136aeadc40584fbf333 /mysql-test | |
| parent | 3ef768b7635e2971f9adeac203d011abe4d66777 (diff) | |
| parent | cfb08851f71624cdd08bdff3bab4466fb2ad8b0b (diff) | |
| download | mariadb-git-9a9224da681dcbce7cfc34593e5b0c8db44900e2.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/key.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/key.test | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index bc9d3935bc4..6c05a3dde8b 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -330,6 +330,16 @@ alter table t1 add key (c1,c1,c2); ERROR 42S21: Duplicate column name 'c1' drop table t1; create table t1 ( +i1 INT NOT NULL, +i2 INT NOT NULL, +UNIQUE i1idx (i1), +UNIQUE i2idx (i2)); +desc t1; +Field Type Null Key Default Extra +i1 int(11) UNI 0 +i2 int(11) UNI 0 +drop table t1; +create table t1 ( c1 int, c2 varchar(20) not null, primary key (c1), diff --git a/mysql-test/t/key.test b/mysql-test/t/key.test index 31763b84379..e7072ae29f6 100644 --- a/mysql-test/t/key.test +++ b/mysql-test/t/key.test @@ -326,6 +326,17 @@ alter table t1 add key (c1,c1,c2); drop table t1; # +# Bug#11228: DESC shows arbitrary column as "PRI" +# +create table t1 ( + i1 INT NOT NULL, + i2 INT NOT NULL, + UNIQUE i1idx (i1), + UNIQUE i2idx (i2)); +desc t1; +drop table t1; + +# # Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE # on large MyISAM table # |