diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-03 17:10:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-03 17:10:49 +0300 |
| commit | cbb92f8156f88bc7e9c3f02dfcda431db9ef7b35 (patch) | |
| tree | 3fb65fd8fc19e08e09f16c5f3b7f52793fe9f04d /sql/field.h | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 1641879387d80d7fd9d4c23ce7a363b910b3cf74 (diff) | |
| download | mariadb-git-cbb92f8156f88bc7e9c3f02dfcda431db9ef7b35.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 061232ea1ef..bf115b38816 100644 --- a/sql/field.h +++ b/sql/field.h @@ -4071,15 +4071,16 @@ public: } void create_length_to_internal_length_simple() { - key_length= pack_length= type_handler()->calc_pack_length(length); + key_length= pack_length= type_handler()->calc_pack_length((uint32) length); } void create_length_to_internal_length_string() { length*= charset->mbmaxlen; if (real_field_type() == MYSQL_TYPE_VARCHAR && compression_method()) length++; - key_length= length; - pack_length= type_handler()->calc_pack_length(length); + DBUG_ASSERT(length <= UINT_MAX32); + key_length= (uint) length; + pack_length= type_handler()->calc_pack_length((uint32) length); } void create_length_to_internal_length_typelib() { |