summaryrefslogtreecommitdiff
path: root/sql/sql_hset.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-02-27 11:52:20 +0100
committerSergei Golubchik <serg@mariadb.org>2020-03-10 19:24:23 +0100
commitc1c5222caed889169fab01612b335ef8b5f56ba5 (patch)
tree5a51707f5e35c4bd3a8cbccc4fd08a9fd67f6914 /sql/sql_hset.h
parent7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (diff)
downloadmariadb-git-c1c5222caed889169fab01612b335ef8b5f56ba5.tar.gz
cleanup: PSI key is *always* the first argument
Diffstat (limited to 'sql/sql_hset.h')
-rw-r--r--sql/sql_hset.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_hset.h b/sql/sql_hset.h
index 6af6e1df371..b3d8165f6f6 100644
--- a/sql/sql_hset.h
+++ b/sql/sql_hset.h
@@ -43,8 +43,8 @@ public:
size_t key_offset, size_t key_length, my_hash_get_key get_key,
void (*free_element)(void*), uint flags)
{
- my_hash_init(&m_hash, charset, default_array_elements, key_offset,
- key_length, get_key, free_element, flags, psi_key);
+ my_hash_init(psi_key, &m_hash, charset, default_array_elements, key_offset,
+ key_length, get_key, free_element, flags);
}
/**
Destroy the hash by freeing the buckets table. Does
@@ -65,8 +65,8 @@ public:
*/
bool insert(T *value)
{
- my_hash_init_opt(&m_hash, m_hash.charset, START_SIZE, 0, 0,
- m_hash.get_key, 0, HASH_UNIQUE, m_hash.array.m_psi_key);
+ my_hash_init_opt(m_hash.array.m_psi_key, &m_hash, m_hash.charset,
+ START_SIZE, 0, 0, m_hash.get_key, 0, HASH_UNIQUE);
return my_hash_insert(&m_hash, reinterpret_cast<const uchar*>(value));
}
bool remove(T *value)