diff options
| author | unknown <serg@infomag.ape.relarn.ru> | 2000-08-18 15:05:36 +0400 |
|---|---|---|
| committer | unknown <serg@infomag.ape.relarn.ru> | 2000-08-18 15:05:36 +0400 |
| commit | 41814b70d62d28e676c0d5f3e1b577c228cafa48 (patch) | |
| tree | 3dbbca56737b885b721ae13db04651dc9dadd757 /myisam | |
| parent | d000fde588c33896739320df947ccf8cbad4b981 (diff) | |
| download | mariadb-git-41814b70d62d28e676c0d5f3e1b577c228cafa48.tar.gz | |
myisam/ft_* bugfix
myisam/ft_search.c:
small bugfix
myisam/ft_eval.c:
HA_KEY_NOT_FOUND => HA_END_OF_FILE
myisam/ft_test1.c:
HA_KEY_NOT_FOUND => HA_END_OF_FILE
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_eval.c | 2 | ||||
| -rw-r--r-- | myisam/ft_search.c | 3 | ||||
| -rw-r--r-- | myisam/ft_test1.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/myisam/ft_eval.c b/myisam/ft_eval.c index 6739e631d8c..008e148385f 100644 --- a/myisam/ft_eval.c +++ b/myisam/ft_eval.c @@ -96,7 +96,7 @@ int main(int argc,char *argv[]) w=ft_get_relevance(result); printf("%d %.*s %f\n",i,t,read_record+2,w); } - if(err != HA_ERR_KEY_NOT_FOUND) { + if(err != HA_ERR_END_OF_FILE) { printf("ft_read_next %d failed with errno %3d\n",j,my_errno); goto err; } diff --git a/myisam/ft_search.c b/myisam/ft_search.c index 31cbd680406..9dfa7f05412 100644 --- a/myisam/ft_search.c +++ b/myisam/ft_search.c @@ -210,7 +210,10 @@ int ft_read_next(FT_DOCLIST *handler, char *record) MI_INFO *info=handler->info; if (++handler->curdoc >= handler->ndocs) + { + --handler->curdoc; return HA_ERR_END_OF_FILE; + } info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); diff --git a/myisam/ft_test1.c b/myisam/ft_test1.c index 780e4f44b6f..dfe8e30383b 100644 --- a/myisam/ft_test1.c +++ b/myisam/ft_test1.c @@ -147,7 +147,7 @@ static int run_test(const char *filename) i,query[i],result->ndocs); for(j=0;j<5;j++) { double w; int err; err=ft_read_next(result, read_record); - if(err==HA_ERR_KEY_NOT_FOUND) { + if(err==HA_ERR_END_OF_FILE) { printf("No more matches!\n"); break; } else if (err) { |