summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-12-14 11:02:24 +0100
committerserg@serg.mysql.com <>2001-12-14 11:02:24 +0100
commita43ceee6ba75d5837d141bf9d42b5db0a3f67deb (patch)
tree5b7d8a613a20a063fda1f682304b5330ca417653 /mysql-test
parent929c8f2e6cff85d63a3106737cab3273e9f0a7a1 (diff)
parent34779f4ee2a31d6b91b1d5563143f24c2b2feaa1 (diff)
downloadmariadb-git-a43ceee6ba75d5837d141bf9d42b5db0a3f67deb.tar.gz
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/fulltext.result6
-rw-r--r--mysql-test/t/fulltext.test3
2 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 68d3b6ecc62..d3038acdc5c 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -55,9 +55,13 @@ 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 * from t1 where MATCH a AGAINST ("sear*" IN BOOLEAN MODE);
+select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);
a b
Full-text search in MySQL implements vector space model
+select * from t1 where MATCH b AGAINST ("sear*" IN BOOLEAN MODE);
+a b
+MySQL has now support for full-text search
+Function MATCH ... AGAINST() is used to do a search
delete from t1 where a like "MySQL%";
update t1 set a='some test foobar' where MATCH a,b AGAINST ('model');
delete from t1 where MATCH(a,b) AGAINST ("indexes");
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index ce003ee33ad..50931637188 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -31,7 +31,8 @@ select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t
# boolean w/o index:
-select * from t1 where MATCH a AGAINST ("sear*" IN BOOLEAN MODE);
+select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);
+select * from t1 where MATCH b AGAINST ("sear*" IN BOOLEAN MODE);
#update/delete with fulltext index