diff options
| author | unknown <serg@serg.mylan> | 2005-01-18 11:45:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-18 11:45:41 +0100 |
| commit | 3671fe1f72e02393d2a42c4defead8b5633c4394 (patch) | |
| tree | 3d1d787bd1981035f2c27e8829b44ef5b571dcca /myisam | |
| parent | ec0daa744fe6b1141e4d8815b574c2a1e38366e8 (diff) | |
| parent | f003895df9f562018ba47e5f7af2eae03d937368 (diff) | |
| download | mariadb-git-3671fe1f72e02393d2a42c4defead8b5633c4394.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index ffc7e1bf104..aab3854dd34 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -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; } @@ -363,7 +364,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) else reset_tree(& ftb->no_dupes); } - + if (_ft2_search(ftb, ftbw, 1)) return; } |