diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 5 | ||||
| -rw-r--r-- | myisam/ft_nlq_search.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index f6092921a02..2a1c07acf0b 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -224,8 +224,9 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) /* Skip rows inserted by concurrent insert */ while (!r && info->lastpos >= info->state->data_file_length) - r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, - SEARCH_BIGGER, keyroot); + r= _mi_search_next(info, ftbw->keyinfo, info->lastkey, + info->lastkey_length, + SEARCH_BIGGER, ftbw->key_root); if (!r && !ftbw->off) { diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index b79bf8a2baa..f8ca7e96564 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -89,8 +89,8 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) doc_cnt=0; /* Skip rows inserted by current inserted */ - for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root) - !r && info->lastpos >= info->state->data_file_length; + for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root) ; + !r && info->lastpos >= info->state->data_file_length ; r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, SEARCH_BIGGER, key_root)) ; @@ -159,8 +159,8 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) SEARCH_BIGGER, key_root); while (!r && info->lastpos >= info->state->data_file_length) - r= _mi_search(info, keyinfo, info->lastkey, info->lastkey_length, - SEARCH_BIGGER, key_root); + r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, + SEARCH_BIGGER, key_root); } word->weight=gweight; |