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 /mysys | |
| parent | 33721d91389759a917463a044fbd6f0b7654d629 (diff) | |
| parent | 1d411a8a440922f0538c1be254d6f4396af453a1 (diff) | |
| download | mariadb-git-c9717dc0190731c656cce31fa6e39a3db123e3af.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index d9952afe318..d89f175c161 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -748,7 +748,7 @@ my_bool my_hash_update(HASH *hash, uchar *record, uchar *old_key, } -uchar *my_hash_element(HASH *hash, ulong idx) +uchar *my_hash_element(HASH *hash, size_t idx) { if (idx < hash->records) return dynamic_element(&hash->array,idx,HASH_LINK*)->data; |