summaryrefslogtreecommitdiff
path: root/myisam/ft_parser.c
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-05-10 18:14:15 -0600
committerunknown <sasha@mysql.sashanet.com>2001-05-10 18:14:15 -0600
commit89d6e639ae535600af4cf3eb7053aa9c4c905580 (patch)
tree41633f2a5b44761a0e57374699711c1eab2cc9e2 /myisam/ft_parser.c
parent174fdf05a14cecb499030460ecceed5f4df79cf9 (diff)
downloadmariadb-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_parser.c')
-rw-r--r--myisam/ft_parser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index d156c8c5556..ee4b5ea7202 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -38,7 +38,8 @@ typedef struct st_ft_docstat {
byte *keybuf;
} FT_DOCSTAT;
-static int FT_WORD_cmp(FT_WORD *w1, FT_WORD *w2)
+static int FT_WORD_cmp(void* cmp_arg __attribute__((unused)),
+ FT_WORD *w1, FT_WORD *w2)
{
return _mi_compare_text(default_charset_info,
(uchar*) w1->pos,w1->len,
@@ -225,7 +226,7 @@ TREE * ft_parse(TREE *wtree, byte *doc, int doclen)
if (!is_tree_inited(wtree))
{
- init_tree(wtree,0,sizeof(FT_WORD),(qsort_cmp)&FT_WORD_cmp,0,NULL);
+ init_tree(wtree,0,sizeof(FT_WORD),(qsort_cmp2)&FT_WORD_cmp,0,NULL);
}
while (ft_simple_get_word(&doc,end,&w))