Merge work.mysql.com:/home/bk/mysql

into cane.mysql.fi:/usr/home/tim/my/work


acconfig.h:
  Auto merged
configure.in:
  Auto merged

4 files changed, 29 insertions, 0 deletions

diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/r/delete.result
diff --git a/mysql-test/r/replace.result b/mysql-test/r/replace.result
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/r/replace.result
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
new file mode 100644
index 00000000000..85802354b2c
--- /dev/null
+++ b/mysql-test/t/delete.test
@@ -0,0 +1,8 @@
+drop table if exists t1;
+
+# test delete using hidden_primary_key
+create table t1 (a int) type=bdb;
+insert into t1 values (1), (2);
+delete from t1 where a = 1;
+
+drop table t1;
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test
new file mode 100644
index 00000000000..4000ee1b4e2
--- /dev/null
+++ b/mysql-test/t/replace.test
@@ -0,0 +1,21 @@
+#
+# Test of REPLACE with ISAM and MyISAM and BDB
+#
+
+drop table if exists t1;
+
+CREATE TABLE t1 (
+  gesuchnr int(11) DEFAULT '0' NOT NULL,
+  benutzer_id int(11) DEFAULT '0' NOT NULL,
+  PRIMARY KEY (gesuchnr,benutzer_id)
+) type=ISAM;
+
+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;