diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
| commit | 7830fb7f45b3824c0375c00ae2cab357165904cf (patch) | |
| tree | 730521737fdc48e69f7650819e9a29da6487e1f4 /sql/key.cc | |
| parent | b805ebd7ed49868f83e6fd3fe72a11ddacdce452 (diff) | |
| parent | 55163ba1bdb1a05daadc66c41c959994231b361c (diff) | |
| download | mariadb-git-7830fb7f45b3824c0375c00ae2cab357165904cf.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/key.cc b/sql/key.cc index 34196a973c5..9ad1103fbe8 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -146,7 +146,8 @@ void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info, { key_length-= HA_KEY_BLOB_LENGTH; length= MY_MIN(key_length, key_part->length); - uint bytes= key_part->field->get_key_image(to_key, length, Field::itRAW); + uint bytes= key_part->field->get_key_image(to_key, length, + key_info->flags & HA_SPATIAL ? Field::itMBR : Field::itRAW); if (with_zerofill && bytes < length) bzero((char*) to_key + bytes, length - bytes); to_key+= HA_KEY_BLOB_LENGTH; |