diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-19 19:42:24 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-19 19:42:24 +0400 |
| commit | 346ea19be724044ce0f86c58587ae7ae6a3015dc (patch) | |
| tree | c07e570e80303ae348ecc9a24e57db41e74a5414 /mysql-test/r/innodb.result | |
| parent | 8bbaf6addd99a477a66c8322d44177dbdac4e4e8 (diff) | |
| parent | 6981af6ff53d63254284a4b6a5370c17075793bc (diff) | |
| download | mariadb-git-346ea19be724044ce0f86c58587ae7ae6a3015dc.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/create.result:
Use local.
mysql-test/r/innodb.result:
Manual merge.
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index ad79a2a837a..ccf87364aff 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1640,7 +1640,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t2; create table t2 (id int(11) not null, id2 int(11) not null, constraint t1_id_fk foreign key (id2,id) references t1 (id)) engine = innodb; -ERROR HY000: Can't create table 'test.t2' (errno: 150) +ERROR 42000: Incorrect foreign key definition for 't1_id_fk': Key reference and table reference don't match create table t2 (a int auto_increment primary key, b int, index(b), foreign key (b) references t1(id), unique(b)) engine=innodb; show create table t2; Table Create Table |