summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-02-22 00:20:09 +0100
committerunknown <serg@serg.mylan>2004-02-22 00:20:09 +0100
commitd8f1d154a4e00a13e971d440552cd4f72cb72afa (patch)
treef9865f84b3ad8b9d2753743e0805d569391eee97 /mysql-test
parent62b22fb71a9b9c56c4824fbf6f1ea53a3a366935 (diff)
parent7759360dca5e4536eb41cb585334c9e088378d80 (diff)
downloadmariadb-git-d8f1d154a4e00a13e971d440552cd4f72cb72afa.tar.gz
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/fulltext.result4
-rw-r--r--mysql-test/t/fulltext.test4
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 651baad266e..738941f63c7 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -117,6 +117,10 @@ MySQL has now support for full-text search
select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
a b
Full-text indexes are called collections
+select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);
+a b
+select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
+a b
select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);
a b
Full-text search in MySQL implements vector space model
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 02657ba3775..774a3b42619 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -18,7 +18,6 @@ select * from t1 where MATCH(a,b) AGAINST ("collections");
select * from t1 where MATCH(a,b) AGAINST ("indexes");
select * from t1 where MATCH(a,b) AGAINST ("indexes collections");
-
# add_ft_keys() tests
explain select * from t1 where MATCH(a,b) AGAINST ("collections");
@@ -54,6 +53,9 @@ select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOL
select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
+select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);
+select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
+
# boolean w/o index:
select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);