summaryrefslogtreecommitdiff
path: root/include/hash.h
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-11-10 15:09:44 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-11-10 15:09:44 +0100
commit58494ba0dfb4fad76deb712383f71c684bb97091 (patch)
tree7052c4524deb8d643a368cfe0e2fa21f519665b2 /include/hash.h
parentd3540b216f2d39126d77985db3f7639eb45bf967 (diff)
downloadmariadb-git-58494ba0dfb4fad76deb712383f71c684bb97091.tar.gz
Review comments for LOCK_open patch
Diffstat (limited to 'include/hash.h')
-rw-r--r--include/hash.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/hash.h b/include/hash.h
index b6fc365ab76..80408f75f4d 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -45,7 +45,6 @@ extern "C" {
#define hash_element my_hash_element
#define hash_search my_hash_search
#define hash_first my_hash_first
-#define hash_first_from_hash_value my_hash_first_from_hash_value
#define hash_next my_hash_next
#define hash_insert my_hash_insert
#define hash_delete my_hash_delete
@@ -65,6 +64,7 @@ extern "C" {
/* flags for hash_init */
#define HASH_UNIQUE 1 /* hash_insert fails on duplicate key */
+typedef uint my_hash_value_type;
typedef uchar *(*my_hash_get_key)(const uchar *,size_t*,my_bool);
typedef void (*my_hash_free_key)(void *);
@@ -95,13 +95,15 @@ void my_hash_free(HASH *tree);
void my_hash_reset(HASH *hash);
uchar *my_hash_element(HASH *hash, ulong idx);
uchar *my_hash_search(const HASH *info, const uchar *key, size_t length);
-uchar *my_hash_search_using_hash_value(const HASH *info, uint hash_value,
+uchar *my_hash_search_using_hash_value(const HASH *info,
+ my_hash_value_type hash_value,
const uchar *key, size_t length);
-uint my_calc_hash(const HASH *info, const uchar *key, size_t length);
+my_hash_value_type my_calc_hash(const HASH *info,
+ const uchar *key, size_t length);
uchar *my_hash_first(const HASH *info, const uchar *key, size_t length,
HASH_SEARCH_STATE *state);
uchar *my_hash_first_from_hash_value(const HASH *info,
- uint hash_value,
+ my_hash_value_type hash_value,
const uchar *key,
size_t length,
HASH_SEARCH_STATE *state);