Commit 29e3a454 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 15a54135 7347504e

myisam/ft_boolean_search.c

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ void _ftb_parse_query(FTB *ftb, byte **start, byte *end, 
        if ((ftbe->quot=param.quot)) ftb->with_scan|=2;

        if (param.yesno > 0) up->ythresh++;

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

        param.quot=0;

        break;

      case 3: /* right bracket */

        if (up->quot) up->qend=param.quot;

myisam/ft_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) 
    {

      if (true_word_char(*doc)) break;

      if (*doc == FTB_RQUOT && param->quot) {

        param->quot=doc-1;

        param->quot=doc;

        *start=doc+1;

        return 3; /* FTB_RBR */

      }

mysql-test/r/fulltext.result

+10 −0
Original line number Diff line number Diff line
@@ -70,6 +70,16 @@ Full-text search in MySQL implements vector space model 0 
select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);

a	b

MySQL has now support	for full-text search

select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);

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 ('"text search" -"now support"' IN BOOLEAN MODE);

a	b

Full-text search in MySQL	implements vector space model

select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);

a	b

MySQL has now support	for full-text search

select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);

a	b

Full-text search in MySQL	implements vector space model

mysql-test/t/fulltext.test

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 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;



select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);

select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);

select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOLEAN MODE);

select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);



# boolean w/o index: