diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 09:33:58 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 09:33:58 +0100 |
| commit | b923b80cfd8628ef973019bf3dba76dda8d940c4 (patch) | |
| tree | 5511aaddb3b3a750cdca5c12906c7ccd58e0b628 /plugin | |
| parent | cea50896d2ea0d18924d92d62a7ec1607d55e509 (diff) | |
| parent | c3a5cf2b5bb0c0e1623a0ddc8e3d49557f35e800 (diff) | |
| download | mariadb-git-b923b80cfd8628ef973019bf3dba76dda8d940c4.tar.gz | |
Merge branch '10.6' into 10.7
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 |