summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-09-14 17:07:15 +0200
committerunknown <monty@work.mysql.com>2001-09-14 17:07:15 +0200
commit09f1278c8a0e93c4793f98ded9bdf001ecd144fe (patch)
tree329b47afcdb09000c65abc96627243d2d131d9a8 /mysql-test
parent37604010a6b22181df16711500e43afe12da4ee9 (diff)
parentbd98eb612170f1ac401518de06b5aabdc1c80c70 (diff)
downloadmariadb-git-09f1278c8a0e93c4793f98ded9bdf001ecd144fe.tar.gz
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0 Docs/manual.texi: Auto merged mysql-test/t/bdb.test: Auto merged sql/ha_berkeley.cc: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/bdb.result5
-rw-r--r--mysql-test/t/bdb.test19
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index e66ca657484..4d26304db4c 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -527,3 +527,8 @@ a b
id id2 id3 dummy1
id id2 id3 dummy1
NULL NULL NULL NULL
+i p s
+00000000-e6c4ddeaa6-003b8-83458387 programs/xxxxxxxx.wmv 00000000-e6c4ddeb32-003bc-83458387
+INFO_NOTE
+INFO_NOTE
+INFO_NOTE
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index 465dc9634cc..50698bb8df6 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -748,3 +748,22 @@ SELECT t1.* FROM t1 WHERE id IN (1);
SELECT t1.* FROM t2 left outer join t1 on (t1.id=t2.id);
delete from t1 where id3 >= 0 and id3 <= 0;
drop table t1,t2;
+
+#
+# Test problems with NULL
+#
+
+CREATE TABLE t1 (i varchar(48) NOT NULL default '', p varchar(255) default NULL,s varchar(48) NOT NULL default '', PRIMARY KEY (i), UNIQUE(p,s)) TYPE=BDB;
+INSERT INTO t1 VALUES ('00000000-e6c4ddeaa6-003b8-83458387','programs/xxxxxxxx.wmv','00000000-e6c4ddeb32-003bc-83458387');
+SELECT * FROM t1 WHERE p='programs/xxxxxxxx.wmv';
+drop table t1;
+
+#
+# Test problem which gave error 'Can't find record in 't1''
+#
+
+CREATE TABLE t1 ( STR_DATE varchar(8) NOT NULL default '',INFO_NOTE varchar(200) default NULL,PRIMARY KEY (STR_DATE) ) TYPE=BerkeleyDB;
+select INFO_NOTE from t1 where STR_DATE = '20010610';
+select INFO_NOTE from t1 where STR_DATE < '20010610';
+select INFO_NOTE from t1 where STR_DATE > '20010610';
+drop table t1;