diff options
| author | unknown <evgen@moonbone.local> | 2006-06-23 14:53:41 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-23 14:53:41 +0400 |
| commit | 27cc02049e5d0c1d8ebb23cf1a2af959772d25ae (patch) | |
| tree | 17b57202e437e09d93179136aeadc40584fbf333 /mysql-test/r/key.result | |
| parent | 6e8cb4d613b3b551b98fcda4b06fa5436b048c8b (diff) | |
| parent | 89e415950cf3b40b15e493cb72784f6ad3dc2b64 (diff) | |
| download | mariadb-git-27cc02049e5d0c1d8ebb23cf1a2af959772d25ae.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/key.result:
Auto merged
mysql-test/t/key.test:
Auto merged
sql/table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
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 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), |