diff options
| author | unknown <jimw@mysql.com> | 2006-02-17 11:06:05 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-17 11:06:05 -0800 |
| commit | ea14fa9aeb11069d47b6709b2323db060d0d43ca (patch) | |
| tree | e23d554f54efdd586f8ba0a29638ad170b85aec9 /mysql-test/r/key.result | |
| parent | bdf18f433188ccccec916f5c23abfbe7f2dd0bb1 (diff) | |
| parent | 80abbcd085c8291e96f2bc4f7b34dcf8849b54e6 (diff) | |
| download | mariadb-git-ea14fa9aeb11069d47b6709b2323db060d0d43ca.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-13883
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/create.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/rpl_mixed_ddl_dml.result:
Auto merged
Diffstat (limited to 'mysql-test/r/key.result')
| -rw-r--r-- | mysql-test/r/key.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index 5d62f8d61d6..c84747a5fee 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -416,7 +416,7 @@ t1 CREATE TABLE `t1` ( `c2` char(12) NOT NULL default '', `c3` varchar(123) NOT NULL default '', `c4` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - PRIMARY KEY (`c2`,`c3`), + PRIMARY KEY (`c2`,`c3`), UNIQUE KEY `i4` (`c4`), KEY `c1` (`c1`), KEY `i1` (`c1`), |