Commit 84103d36 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files

parser bug of "phrase search" fixed

parent 3bd8dba6

myisam/ft_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) 
  byte *doc=*start;

  int mwc;



  param->yesno=(FTB_YES==' ')?1:0;

  param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);

  param->plusminus=param->pmsign=0;



  while (doc<end)
@@ -156,7 +156,7 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) 
        if (*doc == FTB_NEG ) { param->pmsign=!param->pmsign; continue; }

      }

      param->prev=*doc;

      param->yesno=(param->quot != 0);

      param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);

      param->plusminus=param->pmsign=0;

    }

mysql-test/r/fulltext.result

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

a	b

Full-text indexes	are called collections

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

a	b

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

a	b

MySQL has now support	for full-text search

mysql-test/t/fulltext.test

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


select * from t1 where MATCH a,b AGAINST ("+call* +coll*" IN BOOLEAN MODE);



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

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