Commit f003895d authored by unknown's avatar unknown
Browse files

myisam/ft_boolean_search.c 

    -trunc* bug - don't increase yweaks in this case


myisam/ft_boolean_search.c:
  -trunc* bug - don't increase yweaks in this case
mysql-test/r/fulltext.result:
  -trunc* bug - don't increase yweaks in this case
mysql-test/t/fulltext.test:
  -trunc* bug - don't increase yweaks in this case
parent 77b8a94d

myisam/ft_boolean_search.c

+6 −5
Original line number Diff line number Diff line
@@ -345,11 +345,12 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
        if (ftbe->flags & FTB_FLAG_NO ||                     /* 2 */

             ftbe->up->ythresh - ftbe->up->yweaks >1)        /* 1 */

        {

          FTB_EXPR *top_ftbe=ftbe->up->up;

          FTB_EXPR *top_ftbe=ftbe->up;

          ftbw->docid[0]=HA_OFFSET_ERROR;

          for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)

            if (!(ftbe->flags & FTB_FLAG_NO))

              ftbe->yweaks++;

          for (ftbe=(FTB_EXPR *)ftbw;

               ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);

               ftbe=ftbe->up)

              ftbe->up->yweaks++;

          ftbe=0;

          break;

        }

mysql-test/r/fulltext.result

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN B 
a	b

select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);

a	b

select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);

a	b

Full-text indexes	are called collections

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

a	b

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

mysql-test/t/fulltext.test

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE); 


select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);

select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);

select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);

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



# bug#2708, bug#3870 crash