diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 17:53:06 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 17:53:06 +0300 |
commit | 3c2a5ad3e80edc5b3ffffd033732556a8bef13a4 (patch) | |
tree | 83793ba771411c9c1c2582d2c73c9b722e7753c5 /sql/field.cc | |
parent | ba5b2e7b291a9b4bfb97dcdf3c53ca49fc91a4e7 (diff) | |
parent | 3dff84cd158ed09e9c5b1a390af7571fd671f012 (diff) | |
download | mariadb-git-3c2a5ad3e80edc5b3ffffd033732556a8bef13a4.tar.gz |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5af799a6dcc..71bb22c05e5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2008, 2021, MariaDB + Copyright (c) 2008, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -10011,7 +10011,7 @@ int Field_bit::cmp_prefix(const uchar *a, const uchar *b, } -int Field_bit::key_cmp(const uchar *str, uint length) const +int Field_bit::key_cmp(const uchar *str, uint) const { if (bit_len) { @@ -10020,7 +10020,6 @@ int Field_bit::key_cmp(const uchar *str, uint length) const if ((flag= (int) (bits - *str))) return flag; str++; - length--; } return memcmp(ptr, str, bytes_in_rec); } |