summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-03-06 15:11:23 +0000
committerunknown <serg@serg.mysql.com>2002-03-06 15:11:23 +0000
commit9d67a35d877f3bca3bc246cf8da0405231ba923f (patch)
tree9debb8cb21aef88c4c0dd4474a36e605e299aeb4 /mysql-test
parente578a2e23142b863db9c95ebe1d3459c84cfabfe (diff)
parent6ee92bd496aff2b19e1cda6c68faa6f412e0d765 (diff)
downloadmariadb-git-9d67a35d877f3bca3bc246cf8da0405231ba923f.tar.gz
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 Docs/manual.texi: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/fulltext.result9
-rw-r--r--mysql-test/t/fulltext.test3
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 775ec29917f..7f4f3444312 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -48,7 +48,14 @@ Full-text search in MySQL implements vector space model
select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
a b
Function MATCH ... AGAINST() is used to do a search
-select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
+select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
+a b x
+MySQL has now support for full-text search 1
+Full-text indexes are called collections 1
+Only MyISAM tables support collections 2
+Function MATCH ... AGAINST() is used to do a search 0
+Full-text search in MySQL implements vector space model 0
+select *, MATCH(a,b) AGAINST("collections support" IN BOOLEAN MODE) as x from t1;
a b x
MySQL has now support for full-text search 1
Full-text indexes are called collections 1
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 3d203bc61f5..da0c0a52d8a 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -27,7 +27,8 @@ select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MOD
select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE);
select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE);
select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
-select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
+select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
+select *, MATCH(a,b) AGAINST("collections support" IN BOOLEAN MODE) as x from t1;
# boolean w/o index: