diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-21 17:54:23 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-21 17:54:23 +0400 |
| commit | 6085445736210d8a8a3667f231825f5cf28431cd (patch) | |
| tree | 6f81975c558c138eaddd5fed456b60e2470a51d6 /mysql-test/t/innodb.test | |
| parent | d9bad2acc0fa78f77e2c05bd54a04063a26e71b2 (diff) | |
| parent | 16711062954bd202973339ac73382b435d209d9d (diff) | |
| download | mariadb-git-6085445736210d8a8a3667f231825f5cf28431cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/innodb.test')
| -rw-r--r-- | mysql-test/t/innodb.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 96b2ffda7d6..140aac3b9c3 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1178,7 +1178,7 @@ drop table t2; # Clean up filename -- embedded server reports whole path without .frm, # regular server reports relative path with .frm (argh!) --replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ / t2.frm t2 ---error 1005 +--error ER_WRONG_FK_DEF 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; # bug#3749 |