diff options
| author | unknown <ramil@mysql.com> | 2005-02-28 19:59:38 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-02-28 19:59:38 +0400 |
| commit | f9dd79c77d3690cee26aeb0949b74ac76fccdcae (patch) | |
| tree | 6f12cb96c51f12a54cc4aaabfbed0b10a5a08834 /include/hash.h | |
| parent | 3bffc522317ad18102f8a2e5079e3242b6866dcf (diff) | |
| parent | c8b3d65ca26ff2be783115da2fb7c790dd4338e4 (diff) | |
| download | mariadb-git-f9dd79c77d3690cee26aeb0949b74ac76fccdcae.tar.gz | |
merging
mysql-test/r/ps.result:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include/hash.h')
| -rw-r--r-- | include/hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hash.h b/include/hash.h index cd7210a290c..9a6d91036e1 100644 --- a/include/hash.h +++ b/include/hash.h @@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, uint key_length, hash_get_key get_key, void (*free_element)(void*), uint flags CALLER_INFO_PROTO); void hash_free(HASH *tree); -void hash_reset(HASH *hash); +void my_hash_reset(HASH *hash); byte *hash_element(HASH *hash,uint idx); gptr hash_search(HASH *info,const byte *key,uint length); gptr hash_next(HASH *info,const byte *key,uint length); |