Commit 2eee3e98 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 0585db17 50511203

myisam/ft_boolean_search.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void _ftb_parse_query(FTB *ftb, byte **start, byte *end, 
        ftbe->up=up;

        ftbe->ythresh=0;

        ftbe->docid=HA_POS_ERROR;

        if (ftbw->yesno > 0) up->ythresh++;

        if (ftbe->yesno > 0) up->ythresh++;

        _ftb_parse_query(ftb, start, end, ftbe, depth+1,

                         (param.yesno<0 ? depth+1 : ndepth));

        break;

mysql-test/r/fulltext.result

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN 
a	b

MySQL has now support	for full-text search

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

delete from t1 where a like "MySQL%";

drop table t1;

CREATE TABLE t1 (

mysql-test/t/fulltext.test

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE); 
select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MODE);

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

delete from t1 where a like "MySQL%";

drop table t1;