database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-01-24 12:29:31 +02:00
parent e431d90065 76577e1e26
commit d833bb65d5
153 changed files with 1983 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

@ -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);
}