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/myisampack.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/myisampack.c')
| -rw-r--r-- | myisam/myisampack.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 0e4b6eafbde..90ba655e41f 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -124,7 +124,8 @@ static void free_counts_and_tree_and_queue(HUFF_TREE *huff_trees, uint trees, HUFF_COUNTS *huff_counts, uint fields); -static int compare_tree(const uchar *s,const uchar *t); +static int compare_tree(void* cmp_arg __attribute__((unused)), + const uchar *s,const uchar *t); static int get_statistic(MRG_INFO *mrg,HUFF_COUNTS *huff_counts); static void check_counts(HUFF_COUNTS *huff_counts,uint trees, my_off_t records); @@ -673,7 +674,7 @@ static HUFF_COUNTS *init_huff_count(MI_INFO *info,my_off_t records) (type == FIELD_NORMAL || type == FIELD_SKIPP_ZERO)) count[i].max_zero_fill= count[i].field_length; - init_tree(&count[i].int_tree,0,-1,(qsort_cmp) compare_tree,0,NULL); + init_tree(&count[i].int_tree,0,-1,(qsort_cmp2) compare_tree,0,NULL); if (records && type != FIELD_BLOB && type != FIELD_VARCHAR) count[i].tree_pos=count[i].tree_buff = my_malloc(count[i].field_length > 1 ? tree_buff_length : 2, @@ -1289,7 +1290,8 @@ static int make_huff_tree(HUFF_TREE *huff_tree, HUFF_COUNTS *huff_counts) return 0; } -static int compare_tree(register const uchar *s, register const uchar *t) +static int compare_tree(void* cmp_arg __attribute__((unused)), + register const uchar *s, register const uchar *t) { uint length; for (length=global_count->field_length; length-- ;) |