diff options
| author | unknown <thek@adventure.(none)> | 2008-03-18 13:31:10 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-03-18 13:31:10 +0100 |
| commit | 550de36cc5476b2227bd1fa60de7e2870cb2ca60 (patch) | |
| tree | 5a556b4a7e537883639e5d43150c00ada4e50dba /include | |
| parent | 66ca07650fb9eed7448db68b98e2321a7341625f (diff) | |
| parent | ef82f2066232b00de29416a1c71a8cdeede999c5 (diff) | |
| download | mariadb-git-550de36cc5476b2227bd1fa60de7e2870cb2ca60.tar.gz | |
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/hash.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/hash.h b/include/hash.h index d924e62a0ec..4ca8dc0e8bf 100644 --- a/include/hash.h +++ b/include/hash.h @@ -47,8 +47,9 @@ typedef struct st_hash { /* A search iterator state */ typedef uint HASH_SEARCH_STATE; -#define hash_init(A,B,C,D,E,F,G,H) _hash_init(A,B,C,D,E,F,G, H CALLER_INFO) -my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, +#define hash_init(A,B,C,D,E,F,G,H) _hash_init(A,0,B,C,D,E,F,G,H CALLER_INFO) +#define hash_init2(A,B,C,D,E,F,G,H,I) _hash_init(A,B,C,D,E,F,G,H,I CALLER_INFO) +my_bool _hash_init(HASH *hash, uint growth_size,CHARSET_INFO *charset, ulong default_array_elements, size_t key_offset, size_t key_length, hash_get_key get_key, void (*free_element)(void*), uint flags CALLER_INFO_PROTO); @@ -69,7 +70,7 @@ my_bool hash_check(HASH *hash); /* Only in debug library */ #define hash_clear(H) bzero((char*) (H),sizeof(*(H))) #define hash_inited(H) ((H)->array.buffer != 0) #define hash_init_opt(A,B,C,D,E,F,G,H) \ - (!hash_inited(A) && _hash_init(A,B,C,D,E,F,G, H CALLER_INFO)) + (!hash_inited(A) && _hash_init(A,0,B,C,D,E,F,G, H CALLER_INFO)) #ifdef __cplusplus } |