diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-22 11:52:17 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-22 11:52:17 +0200 |
| commit | 9433c5387ea9e4ccacc0b1b78b9df27622f8eaae (patch) | |
| tree | 66cc19e445c245361de212b34cf8f019322e916d /myisam | |
| parent | b09eb958698a8a984ea8efccec08e25238f3bf3a (diff) | |
| download | mariadb-git-9433c5387ea9e4ccacc0b1b78b9df27622f8eaae.tar.gz | |
I have to commit to be able to pull
include/ft_global.h:
I have to checkin to be able to pull
myisam/ft_boolean_search.c:
I have to checkin to be able to pull
myisam/ft_nlq_search.c:
I have to checkin to be able to pull
myisam/ftdefs.h:
I have to checkin to be able to pull
sql/item_func.cc:
I have to checkin to be able to pull
sql/item_func.h:
I have to checkin to be able to pull
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 4 | ||||
| -rw-r--r-- | myisam/ft_nlq_search.c | 3 | ||||
| -rw-r--r-- | myisam/ftdefs.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index a850827c52e..15a6348336d 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -321,9 +321,9 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record) return my_errno=HA_ERR_END_OF_FILE; } -float ft_boolean_find_relevance(FT_INFO *ftb, my_off_t docid) +float ft_boolean_find_relevance(FT_INFO *ftb, + my_off_t docid __attribute__((unused)), byte *record) { - fprintf(stderr, "ft_boolean_find_relevance called!\n"); return -1.0; /* to be done via str scan */ } diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index f0f878a7f16..93c63369ecc 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -247,7 +247,8 @@ int ft_nlq_read_next(FT_INFO *handler, char *record) return my_errno; } -float ft_nlq_find_relevance(FT_INFO *handler, my_off_t docid) +float ft_nlq_find_relevance(FT_INFO *handler, my_off_t docid, + byte *record __attribute__((unused))) { int a,b,c; FT_DOC *docs=handler->doc; diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index 9eedf57c759..0d5aaf931e3 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -126,7 +126,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *, uint , byte *, const byte *); const struct _ft_vft _ft_vft_nlq; FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, my_bool); int ft_nlq_read_next(FT_INFO *, char *); -float ft_nlq_find_relevance(FT_INFO *, my_off_t ); +float ft_nlq_find_relevance(FT_INFO *, my_off_t, byte *); void ft_nlq_close_search(FT_INFO *); float ft_nlq_get_relevance(FT_INFO *); my_off_t ft_nlq_get_docid(FT_INFO *); @@ -135,7 +135,7 @@ void ft_nlq_reinit_search(FT_INFO *); const struct _ft_vft _ft_vft_boolean; FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, my_bool); int ft_boolean_read_next(FT_INFO *, char *); -float ft_boolean_find_relevance(FT_INFO *, my_off_t ); +float ft_boolean_find_relevance(FT_INFO *, my_off_t, byte *); void ft_boolean_close_search(FT_INFO *); float ft_boolean_get_relevance(FT_INFO *); my_off_t ft_boolean_get_docid(FT_INFO *); |