summaryrefslogtreecommitdiff
path: root/include/hash.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-11-19 09:13:38 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 10:41:51 +0100
commit2ae7541bcf93985302bc7efb2629e6f623ccfc64 (patch)
treed0b14c1dba4bffc2ae82f2d51f1f9ef4ebf7035a /include/hash.h
parent0d30423900dd3a384f061c32f6ec3de9c11cdde9 (diff)
downloadmariadb-git-2ae7541bcf93985302bc7efb2629e6f623ccfc64.tar.gz
cleanup: s/const CHARSET_INFO/CHARSET_INFO/
as CHARSET_INFO is already const, using const on it is redundant and results in compiler warnings (on Windows)
Diffstat (limited to 'include/hash.h')
-rw-r--r--include/hash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hash.h b/include/hash.h
index ba36df23f58..fde7fc30d38 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -44,7 +44,7 @@ extern "C" {
typedef uint my_hash_value_type;
typedef uchar *(*my_hash_get_key)(const uchar *,size_t*,my_bool);
-typedef my_hash_value_type (*my_hash_function)(const CHARSET_INFO *,
+typedef my_hash_value_type (*my_hash_function)(CHARSET_INFO *,
const uchar *, size_t);
typedef void (*my_hash_free_key)(void *);
typedef my_bool (*my_hash_walk_action)(void *,void *);
@@ -78,7 +78,7 @@ uchar *my_hash_search(const HASH *info, const uchar *key, size_t length);
uchar *my_hash_search_using_hash_value(const HASH *info,
my_hash_value_type hash_value,
const uchar *key, size_t length);
-my_hash_value_type my_hash_sort(const CHARSET_INFO *cs,
+my_hash_value_type my_hash_sort(CHARSET_INFO *cs,
const uchar *key, size_t length);
#define my_calc_hash(A, B, C) my_hash_sort((A)->charset, B, C)
uchar *my_hash_first(const HASH *info, const uchar *key, size_t length,