Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

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");

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