database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.1-13883

Browse Source 
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
This commit is contained in:
unknown
2006-02-17 11:06:05 -08:00
parent bdf18f4331 80abbcd085
commit ea14fa9aeb
21 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/key.result
View File

@ -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`),