diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/key.cc | |
parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/key.cc')
-rw-r--r-- | sql/key.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/key.cc b/sql/key.cc index bf50094a9e4..adff6975631 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -228,7 +228,7 @@ void key_restore(uchar *to_record, const uchar *from_key, KEY *key_info, { /* This in fact never happens, as we have only partial BLOB - keys yet anyway, so it's difficult to find any sence to + keys yet anyway, so it's difficult to find any sense to restore the part of a record. Maybe this branch is to be removed, but now we have to ignore GCov compaining. @@ -612,8 +612,8 @@ int key_rec_cmp(void *key_p, uchar *first_rec, uchar *second_rec) max length. The exceptions are the BLOB and VARCHAR field types that take the max length into account. */ - if ((result= field->cmp_max(field->ptr+first_diff, field->ptr+sec_diff, - key_part->length))) + if ((result= field->cmp_prefix(field->ptr+first_diff, field->ptr+sec_diff, + key_part->length))) DBUG_RETURN(result); next_loop: key_part++; |