diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-10 18:14:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-10 18:14:15 -0600 |
| commit | 89d6e639ae535600af4cf3eb7053aa9c4c905580 (patch) | |
| tree | 41633f2a5b44761a0e57374699711c1eab2cc9e2 /myisam/ft_nlq_search.c | |
| parent | 174fdf05a14cecb499030460ecceed5f4df79cf9 (diff) | |
| download | mariadb-git-89d6e639ae535600af4cf3eb7053aa9c4c905580.tar.gz | |
change tree to use qsort_cmp2 - compare function with 3 instead of 2 arguments
include/global.h:
qsort_cmp2
include/my_tree.h:
use qsort_cmp2
myisam/ft_boolean_search.c:
use qsort_cmp2
myisam/ft_nlq_search.c:
use qsort_cmp2
myisam/ft_parser.c:
use qsort_cmp2
myisam/ft_stopwords.c:
use qsort_cmp2
myisam/myisampack.c:
use qsort_cmp2
mysys/tree.c:
use qsort_cmp2
sql/sql_analyse.cc:
use qsort_cmp2
sql/sql_analyse.h:
use qsort_cmp2
Diffstat (limited to 'myisam/ft_nlq_search.c')
| -rw-r--r-- | myisam/ft_nlq_search.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 3b4937ca4d9..6d76fcef6e8 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -35,7 +35,8 @@ typedef struct st_ft_superdoc { double tmp_weight; } FT_SUPERDOC; -static int FT_SUPERDOC_cmp(FT_SUPERDOC *p1, FT_SUPERDOC *p2) +static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)), + FT_SUPERDOC *p1, FT_SUPERDOC *p2) { if (p1->doc.dpos < p2->doc.dpos) return -1; @@ -162,7 +163,7 @@ FT_DOCLIST *ft_nlq_search(MI_INFO *info, uint keynr, byte *query, bzero(&allocated_wtree,sizeof(allocated_wtree)); - init_tree(&aio.dtree,0,sizeof(FT_SUPERDOC),(qsort_cmp)&FT_SUPERDOC_cmp,0, + init_tree(&aio.dtree,0,sizeof(FT_SUPERDOC),(qsort_cmp2)&FT_SUPERDOC_cmp,0, NULL); if(!(wtree=ft_parse(&allocated_wtree,query,query_len))) |