diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
| commit | d833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch) | |
| tree | d1271339e1c3a660e4788a5c9913bfe54e0271f1 /sql/field.cc | |
| parent | e431d90065d277e62fa4f81a1654790f58a84146 (diff) | |
| parent | 76577e1e2602f3c30859a176808c433a263e1b0a (diff) | |
| download | mariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index f4aaaca69d6..c36fff06a07 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1873,7 +1873,7 @@ uint Field::fill_cache_field(CACHE_FIELD *copy) { uint store_length; copy->str= ptr; - copy->length= pack_length(); + copy->length= pack_length_in_rec(); copy->field= this; if (flags & BLOB_FLAG) { @@ -8711,7 +8711,7 @@ int Field_bit::key_cmp(const uchar *str, uint length) str++; length--; } - return memcmp(ptr, str, length); + return memcmp(ptr, str, bytes_in_rec); } |