database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-11-02 13:44:07 +01:00
parent c18054deb2 7196691b44
commit a98c85bb50
162 changed files with 5637 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/opt_range.cc
View File

@ -2757,9 +2757,16 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param,
{
Field *field= *field_ptr;
uint16 store_length;
uint16 max_key_part_length= (uint16) table->file->max_key_part_length();
key_part->key= keys;
key_part->part= 0;
key_part->length= (uint16) field->key_length();
if (field->flags & BLOB_FLAG)
key_part->length= max_key_part_length;
else
{
key_part->length= (uint16) field->key_length();
set_if_smaller(key_part->length, max_key_part_length);
}
store_length= key_part->length;
if (field->real_maybe_null())
store_length+= HA_KEY_NULL_LENGTH;