diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hash.h | 17 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/hash.h b/include/hash.h index 19d7189cf4d..00ffca503fc 100644 --- a/include/hash.h +++ b/include/hash.h @@ -63,13 +63,12 @@ typedef struct st_hash { /* A search iterator state */ typedef uint HASH_SEARCH_STATE; -#define my_hash_init(A,B,C,D,E,F,G,H,I) my_hash_init2(A,0,B,C,D,E,F,0,G,H,I) -my_bool my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset, - ulong default_array_elements, size_t key_offset, - size_t key_length, my_hash_get_key get_key, - my_hash_function hash_function, - void (*free_element)(void*), - uint flags, PSI_memory_key psi_key); +#define my_hash_init(A,B,C,D,E,F,G,H,I) my_hash_init2(A,B,0,C,D,E,F,G,0,H,I) +my_bool my_hash_init2(PSI_memory_key psi_key, HASH *hash, uint growth_size, + CHARSET_INFO *charset, ulong default_array_elements, + size_t key_offset, size_t key_length, + my_hash_get_key get_key, my_hash_function hash_function, + void (*free_element)(void*), uint flags); void my_hash_free(HASH *tree); void my_hash_reset(HASH *hash); uchar *my_hash_element(HASH *hash, size_t idx); @@ -99,8 +98,8 @@ my_bool my_hash_iterate(HASH *hash, my_hash_walk_action action, void *argument); #define my_hash_clear(H) bzero((char*) (H), sizeof(*(H))) #define my_hash_inited(H) ((H)->blength != 0) -#define my_hash_init_opt(A,B,C,D,E,F,G,H, I) \ - (!my_hash_inited(A) && my_hash_init(A,B,C,D,E,F,G,H, I)) +#define my_hash_init_opt(A,B,C,D,E,F,G,H,I) \ + (!my_hash_inited(B) && my_hash_init(A,B,C,D,E,F,G,H,I)) #ifdef __cplusplus } diff --git a/include/my_sys.h b/include/my_sys.h index 8ce621e500b..3d271c93a17 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -843,7 +843,7 @@ File create_temp_file(char *to, const char *dir, const char *pfx, int mode, myf MyFlags); #define my_init_dynamic_array(A,B,C,D,E,F) init_dynamic_array2(A,B,C,NULL,D,E,F) #define my_init_dynamic_array2(A,B,C,D,E,F,G) init_dynamic_array2(A,B,C,D,E,F,G) -extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, PSI_memory_key psi_key, +extern my_bool init_dynamic_array2(PSI_memory_key psi_key, DYNAMIC_ARRAY *array, uint element_size, void *init_buffer, uint init_alloc, uint alloc_increment, myf my_flags); |