summaryrefslogtreecommitdiff
path: root/sql/hash_filo.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
committermonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
commitdac6498f9b5b28d94473baf46c6e6f174943728d (patch)
treed3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /sql/hash_filo.h
parent305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff)
parente60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff)
downloadmariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz
Merge with 4.0
Diffstat (limited to 'sql/hash_filo.h')
-rw-r--r--sql/hash_filo.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/hash_filo.h b/sql/hash_filo.h
index 4d746d9b9bd..f7384cc6e32 100644
--- a/sql/hash_filo.h
+++ b/sql/hash_filo.h
@@ -40,7 +40,7 @@ class hash_filo
{
const uint size, key_offset, key_length;
const hash_get_key get_key;
- void (*free_element)(void*);
+ hash_free_key free_element;
bool init;
hash_filo_element *first_link,*last_link;
@@ -49,7 +49,7 @@ public:
HASH cache;
hash_filo(uint size_arg, uint key_offset_arg , uint key_length_arg,
- hash_get_key get_key_arg,void (*free_element_arg)(void*))
+ hash_get_key get_key_arg, hash_free_key free_element_arg)
:size(size_arg), key_offset(key_offset_arg), key_length(key_length_arg),
get_key(get_key_arg), free_element(free_element_arg),init(0)
{