diff options
| author | unknown <monty@mysql.com> | 2006-06-30 19:15:18 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 19:15:18 +0300 |
| commit | 9606675ba20eb309a1f402f92d06e2de8aed22d2 (patch) | |
| tree | 15c1c844006e3cdc77167f5ef3986b9d40c16104 /mysql-test/r/key.result | |
| parent | b138b55d1d72442482cac6f70450cb6ccf492b4b (diff) | |
| parent | e0171231a58d5ada5e5f6e5db83617aab550f21d (diff) | |
| download | mariadb-git-9606675ba20eb309a1f402f92d06e2de8aed22d2.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/key.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/key.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
(Now we have same code as in 4.1 and 5.1)
sql/ha_ndbcluster.cc:
Manual merge
Change %ll -> llstr()
tests/mysql_client_test.c:
manual merge
Diffstat (limited to 'mysql-test/r/key.result')
| -rw-r--r-- | mysql-test/r/key.result | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index a6f05143b3e..6a362d6b86a 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -336,8 +336,16 @@ UNIQUE i1idx (i1), UNIQUE i2idx (i2)); desc t1; Field Type Null Key Default Extra -i1 int(11) NO UNI +i1 int(11) NO PRI i2 int(11) NO UNI +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `i1` int(11) NOT NULL default '0', + `i2` int(11) NOT NULL default '0', + UNIQUE KEY `i1idx` (`i1`), + UNIQUE KEY `i2idx` (`i2`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 ( c1 int, |