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 /mysys/hash.c | |
| 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 'mysys/hash.c')
| -rw-r--r-- | mysys/hash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 4532b06b533..9166ae6f788 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -46,7 +46,7 @@ static uint calc_hash(const HASH *hash, const uchar *key, size_t length) } my_bool -_hash_init(HASH *hash,CHARSET_INFO *charset, +_hash_init(HASH *hash,uint growth_size, CHARSET_INFO *charset, ulong size, size_t key_offset, size_t key_length, hash_get_key get_key, void (*free_element)(void*),uint flags CALLER_INFO_PROTO) @@ -55,7 +55,8 @@ _hash_init(HASH *hash,CHARSET_INFO *charset, DBUG_PRINT("enter",("hash: 0x%lx size: %u", (long) hash, (uint) size)); hash->records=0; - if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0)) + if (my_init_dynamic_array_ci(&hash->array, sizeof(HASH_LINK), size, + growth_size)) { hash->free=0; /* Allow call to hash_free */ DBUG_RETURN(1); |