diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:15:33 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:15:33 +0400 |
| commit | ca98fb63ad79340e256514c330a1ad01e7865119 (patch) | |
| tree | 4c885ed89bde1edf7833be8862569515cbba1f7d /mysql-test | |
| parent | 63fce3a24e33407d58a17ec2946caa08e6c1b537 (diff) | |
| parent | f660dfa64f29341bd4a40e1748370173707208e7 (diff) | |
| download | mariadb-git-ca98fb63ad79340e256514c330a1ad01e7865119.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1-opt
into mysql.com:/home/hf/work/embt/my41-embt
libmysqld/lib_sql.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/delayed.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index a32eec536ea..961bcc946bf 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -1,3 +1,5 @@ +# delayed works differently in embedded server +--source include/not_embedded.inc # # test of DELAYED insert and timestamps # (Can't be tested with purify :( ) diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 3e53cadf76c..7e594c358f2 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1299,6 +1299,7 @@ drop table test_checksum; set foreign_key_checks=0; create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb; +--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ / -- error 1005 create table t1(a char(10) primary key, b varchar(20)) engine = innodb; set foreign_key_checks=1; @@ -1309,6 +1310,7 @@ drop table t2; set foreign_key_checks=0; create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1; +--replace_result \\ / $MYSQL_TEST_DIR . /var/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; @@ -1338,6 +1340,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 \\ / $MYSQL_TEST_DIR . /var/master-data/ / -- error 1025 rename table t3 to t1; set foreign_key_checks=1; |