diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
| commit | c7c415734d27fb98f8019d4c3b646bbdb4906e46 (patch) | |
| tree | 1b71b075e54aac0e7b3b5a240f5835b0cc1d61d4 /plugin | |
| parent | 10635c2833a951b11b1d56e388244127e257ffb5 (diff) | |
| parent | 76bcea3154a3ac2c26024ac5cb241e19e0e277d9 (diff) | |
| download | mariadb-git-c7c415734d27fb98f8019d4c3b646bbdb4906e46.tar.gz | |
Merge branch '10.10' into 10.11
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/type_uuid/sql_type_uuid.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugin/type_uuid/sql_type_uuid.h b/plugin/type_uuid/sql_type_uuid.h index be9fea8ebc9..ee39f542f05 100644 --- a/plugin/type_uuid/sql_type_uuid.h +++ b/plugin/type_uuid/sql_type_uuid.h @@ -64,9 +64,9 @@ public: { return memcmp(a + m_memory_pos, b + m_memory_pos, m_length); } - void hash_record(const uchar *ptr, ulong *nr, ulong *nr2) const + void hash_record(const uchar *ptr, Hasher *hasher) const { - my_charset_bin.hash_sort(ptr + m_record_pos, m_length, nr, nr2); + hasher->add(&my_charset_bin, ptr + m_record_pos, m_length); } }; @@ -119,13 +119,13 @@ public: put values into the same partition. */ - static void hash_record(const uchar *ptr, ulong *nr, ulong *nr2) + static void hash_record(const uchar *ptr, Hasher *hasher) { - segment(0).hash_record(ptr, nr, nr2); - segment(1).hash_record(ptr, nr, nr2); - segment(2).hash_record(ptr, nr, nr2); - segment(3).hash_record(ptr, nr, nr2); - segment(4).hash_record(ptr, nr, nr2); + segment(0).hash_record(ptr, hasher); + segment(1).hash_record(ptr, hasher); + segment(2).hash_record(ptr, hasher); + segment(3).hash_record(ptr, hasher); + segment(4).hash_record(ptr, hasher); } // Compare two in-memory values |