diff options
| author | evgen@moonbone.local <> | 2006-06-28 19:34:04 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-06-28 19:34:04 +0400 |
| commit | 82369c4e65753ca84d81e6875f79af66eb084daf (patch) | |
| tree | 3c5baf35e4a619852c09b91014b8172b38a30001 /mysql-test/r/key.result | |
| parent | 3e22ea44e55d5295829f7383b31914c2fcb5894c (diff) | |
| parent | c74cc187899b03710efc1b0f43d7d391f721388d (diff) | |
| download | mariadb-git-82369c4e65753ca84d81e6875f79af66eb084daf.tar.gz | |
Manual merge
Diffstat (limited to 'mysql-test/r/key.result')
| -rw-r--r-- | mysql-test/r/key.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index 68174774531..af1db92b1ef 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) NO UNI +i2 int(11) NO UNI +drop table t1; +create table t1 ( c1 int, c2 varchar(20) not null, primary key (c1), |