diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:12:18 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:10 +0200 |
commit | c9717dc0190731c656cce31fa6e39a3db123e3af (patch) | |
tree | 3db056a3f50e565294d127edb5339afb0a994749 /include/hash.h | |
parent | 33721d91389759a917463a044fbd6f0b7654d629 (diff) | |
parent | 1d411a8a440922f0538c1be254d6f4396af453a1 (diff) | |
download | mariadb-git-c9717dc0190731c656cce31fa6e39a3db123e3af.tar.gz |
Merge branch '10.2' into 10.3
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 75ad0b6d9a0..068700aaec6 100644 --- a/include/hash.h +++ b/include/hash.h @@ -72,7 +72,7 @@ my_bool my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset, uint flags); void my_hash_free(HASH *tree); void my_hash_reset(HASH *hash); -uchar *my_hash_element(HASH *hash, ulong idx); +uchar *my_hash_element(HASH *hash, size_t idx); 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, |