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/t/innodb.test | |
| 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/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 321a1f4763a..b81f62d66d7 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 |