diff options
author | unknown <aivanov@mysql.com> | 2006-03-30 00:17:35 +0400 |
---|---|---|
committer | unknown <aivanov@mysql.com> | 2006-03-30 00:17:35 +0400 |
commit | 5dddbb4a3614c964f292bb8955365a4bd099d8dc (patch) | |
tree | e97bb663e811d0aaeec4bd5be7f43ea7e1be642c /mysql-test | |
parent | 20e609d09bfdc8bb3874bdb5ce4287fa0d298362 (diff) | |
download | mariadb-git-5dddbb4a3614c964f292bb8955365a4bd099d8dc.tar.gz |
Restoring changes erroneously removed by applying
the innodb-5.0-ss368 snapshot.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/innodb.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 1781873a87b..832c4635815 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1762,6 +1762,7 @@ commit; set foreign_key_checks=0; create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb; +--replace_result $MYSQLTEST_VARDIR . master-data/ '' -- error 1005 create table t1(a char(10) primary key, b varchar(20)) engine = innodb; set foreign_key_checks=1; @@ -1772,6 +1773,7 @@ drop table t2; set foreign_key_checks=0; create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1; +--replace_result $MYSQLTEST_VARDIR . master-data/ '' -- error 1005 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8; set foreign_key_checks=1; @@ -1801,6 +1803,7 @@ drop table t2,t1; set foreign_key_checks=0; create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1; create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8; +--replace_result $MYSQLTEST_VARDIR . master-data/ '' -- error 1025 rename table t3 to t1; set foreign_key_checks=1; |