summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-04-09 11:45:14 +0500
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-04-09 11:45:14 +0500
commitd2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0 (patch)
tree3b60d9c94a9cb3e81e8c9ff68a567dfe598f301a /mysql-test/t
parent1f8dbdaf3a2bd06a87ed9fba93acb742c86fa83b (diff)
parent6d9a796944c865afd9aab40711e1b134cb2245bc (diff)
downloadmariadb-git-d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0.tar.gz
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/archive.test10
-rw-r--r--mysql-test/t/fulltext_left_join.test11
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index 80533f21311..0ffbfab3d4f 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1364,3 +1364,13 @@ SELECT * from t2;
drop table t1, t2, t4;
+
+#
+# BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in ARCHIVE
+# table
+#
+create table t1 (i int) engine=archive;
+insert into t1 values (1);
+repair table t1 use_frm;
+select * from t1;
+drop table t1;
diff --git a/mysql-test/t/fulltext_left_join.test b/mysql-test/t/fulltext_left_join.test
index 5942ce119ee..8c13ae5cad9 100644
--- a/mysql-test/t/fulltext_left_join.test
+++ b/mysql-test/t/fulltext_left_join.test
@@ -87,3 +87,14 @@ SELECT t1.*, MATCH(t1.name) AGAINST('string') AS relevance
DROP TABLE t1,t2;
# End of 4.1 tests
+
+#
+# BUG#25729 - boolean full text search is confused by NULLs produced by LEFT
+# JOIN
+#
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (b INT, c TEXT, KEY(b));
+INSERT INTO t1 VALUES(1);
+INSERT INTO t2(b,c) VALUES(2,'castle'),(3,'castle');
+SELECT * FROM t1 LEFT JOIN t2 ON a=b WHERE MATCH(c) AGAINST('+castle' IN BOOLEAN MODE);
+DROP TABLE t1, t2;