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_stopwords.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_stopwords.c')
| -rw-r--r-- | myisam/ft_stopwords.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/ft_stopwords.c b/myisam/ft_stopwords.c index 556f52650c8..d3dedc4c406 100644 --- a/myisam/ft_stopwords.c +++ b/myisam/ft_stopwords.c @@ -25,7 +25,8 @@ typedef struct st_ft_stopwords { static TREE *stopwords3=NULL; -static int FT_STOPWORD_cmp(FT_STOPWORD *w1, FT_STOPWORD *w2) +static int FT_STOPWORD_cmp(void* cmp_arg __attribute__((unused)), + FT_STOPWORD *w1, FT_STOPWORD *w2) { return _mi_compare_text(default_charset_info, (uchar *)w1->pos,w1->len, @@ -40,7 +41,7 @@ int ft_init_stopwords(const char **sws) if(!stopwords3) { if(!(stopwords3=(TREE *)my_malloc(sizeof(TREE),MYF(0)))) return -1; - init_tree(stopwords3,0,sizeof(FT_STOPWORD),(qsort_cmp)&FT_STOPWORD_cmp,0, + init_tree(stopwords3,0,sizeof(FT_STOPWORD),(qsort_cmp2)&FT_STOPWORD_cmp,0, NULL); } |