summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-08-07 20:18:51 +0300
committerunknown <monty@mashka.mysql.fi>2003-08-07 20:18:51 +0300
commit6db21de014d603477952c7a16449bcae40a70e5c (patch)
treedede3c4032371335b0e52c74cca1beba2483d7c6 /mysql-test
parent46f5c97d312a84c0620958f4fcf0df6acd676256 (diff)
parentfa1613be0a54ba87321501a52d62d4e99d237945 (diff)
downloadmariadb-git-6db21de014d603477952c7a16449bcae40a70e5c.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0 sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/rpl_insert_id.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_insert_id.test b/mysql-test/t/rpl_insert_id.test
index d91bd02883e..49fefae72b8 100644
--- a/mysql-test/t/rpl_insert_id.test
+++ b/mysql-test/t/rpl_insert_id.test
@@ -4,6 +4,7 @@
# We also check how the foreign_key_check variable is replicated
source include/master-slave.inc;
+source include/have_innodb.inc
connection master;
drop table if exists t1;
create table t1(a int auto_increment, key(a));