3 files changed, 21 insertions, 14 deletions
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index c60e3b0b72e..ed415a91205 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -1,3 +1,5 @@
+-- source include/have_bdb.inc
+
 drop table if exists t1;
 create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) type=bdb;
 
@@ -10,3 +12,19 @@ update ignore t1 set id = id + 10, name = 'Ralph' where id < 4;
 select id, code, name from t1 order by id;
 
 drop table t1;
+
+#
+# Test replace
+#
+
+CREATE TABLE t1 (
+  gesuchnr int(11) DEFAULT '0' NOT NULL,
+  benutzer_id int(11) DEFAULT '0' NOT NULL,
+  PRIMARY KEY (gesuchnr,benutzer_id)
+) type=BDB;
+
+replace into t1 (gesuchnr,benutzer_id) values (2,1);
+replace into t1 (gesuchnr,benutzer_id) values (1,1);
+replace into t1 (gesuchnr,benutzer_id) values (1,1);
+select * from t1;
+drop table t1;
diff --git a/mysql-test/t/include/master-slave.inc b/mysql-test/t/include/master-slave.inc
deleted file mode 100644
index 137749912a7..00000000000
--- a/mysql-test/t/include/master-slave.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (master1,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
-connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock);
-connection slave;
-!slave stop;
-connection master;
-reset master;
-connection slave;
-reset slave;
-!slave start;
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test
index 2d59b26a525..100941108c8 100644
--- a/mysql-test/t/replace.test
+++ b/mysql-test/t/replace.test
@@ -1,5 +1,7 @@
+-- source include/have_isam.inc
+
 #
-# Test of REPLACE with ISAM and MyISAM and BDB
+# Test of REPLACE with ISAM and MyISAM and HEAP
 #
 
 drop table if exists t1;
@@ -15,8 +17,6 @@ replace into t1 (gesuchnr,benutzer_id) values (1,1);
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 alter table t1 type=myisam;
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
-alter table t1 type=bdb;
-replace into t1 (gesuchnr,benutzer_id) values (1,1);
 alter table t1 type=heap;
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 drop table t1;