mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

change tree to use qsort_cmp2 - compare function with 3 instead of 2 arguments

Browse source 
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
This commit is contained in:
unknown 2001-05-10 18:14:15 -06:00
commit 89d6e639ae
10 changed files with 74 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/global.h
View file

@ -349,6 +349,7 @@ typedef int pshort; /* Mixed prototypes can't take short int */
typedef double pfloat; /* Mixed prototypes can't take float */
#endif
typedef int (*qsort_cmp)(const void *,const void *);
typedef int (*qsort_cmp2)(void*, const void *,const void *);
#ifdef HAVE_mit_thread
#define qsort_t void
#undef QSORT_TYPE_IS_VOID

5
include/my_tree.h
View file

@ -50,7 +50,8 @@ typedef struct st_tree {
TREE_ELEMENT *root,null_element;
TREE_ELEMENT **parents[MAX_TREE_HIGHT];
uint offset_to_key,elements_in_tree,size_of_element;
qsort_cmp compare;
qsort_cmp2 compare;
void* cmp_arg;
MEM_ROOT mem_root;
my_bool with_delete;
void (*free)(void *);
@ -58,7 +59,7 @@ typedef struct st_tree {
/* Functions on hole tree */
void init_tree(TREE *tree,uint default_alloc_size, int element_size,
qsort_cmp compare, my_bool with_delete,
qsort_cmp2 compare, my_bool with_delete,
void (*free_element)(void*));
void delete_tree(TREE*);
#define is_tree_inited(tree) ((tree)->root != 0)