Skip to content
/ server Public
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions storage/heap/hp_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const uchar *rec1, const uchar *rec2)
because some virtual implementations do not work correctly. For details see:
https://jira.mariadb.org/browse/MDEV-38712
*/
if (cs->mbmaxlen > 1 && !(cs->state && MY_CS_NOPAD))
if (cs->mbmaxlen > 1 && !(cs->state & MY_CS_NOPAD))
{
size_t nchars= seg->length / cs->mbmaxlen;
if (my_ci_strnncollsp_nchars(cs,
Expand Down Expand Up @@ -550,7 +550,7 @@ int hp_key_cmp(HP_KEYDEF *keydef, const uchar *rec, const uchar *key)
size_t char_length_key= uint2korr(key);
pos+= pack_length;
key+= 2; /* skip key pack length */
if (cs->mbmaxlen > 1 && !(cs->state && MY_CS_NOPAD))
if (cs->mbmaxlen > 1 && !(cs->state & MY_CS_NOPAD))
{
size_t nchars= seg->length / cs->mbmaxlen;
if (my_ci_strnncollsp_nchars(cs,
Expand Down