diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
| commit | 8ae8cd63485eb063de0b70ea6f3acf7102a61fef (patch) | |
| tree | 70fa448baa769b6c8c331063a61bf929ad61c976 /sql/key.cc | |
| parent | 6857cb57fe7090f131b272f31485b7a478a0b324 (diff) | |
| parent | 387bdf07ae0973bc3e4dc3f5064d2a29c64bb769 (diff) | |
| download | mariadb-git-8ae8cd63485eb063de0b70ea6f3acf7102a61fef.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/key.cc b/sql/key.cc index c2d22005736..db44e4780c4 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -374,7 +374,7 @@ void field_unpack(String *to, Field *field, const uchar *rec, uint max_length, { const char *tmp_end= tmp.ptr() + tmp.length(); while (tmp_end > tmp.ptr() && !*--tmp_end) ; - tmp.length(tmp_end - tmp.ptr() + 1); + tmp.length((uint32)(tmp_end - tmp.ptr() + 1)); } if (cs->mbmaxlen > 1 && prefix_key) { |