diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-06-10 17:06:38 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-06-10 17:06:38 +0400 |
| commit | 4155d0937b98e57a93adbe5b5dc20d06ceda59e7 (patch) | |
| tree | 165bc57c43c4db2ca7dad2b95a275c3386dca5dc /sql/field.h | |
| parent | df1448801ceba4d8d8a02db83ba022fea9e6755d (diff) | |
| download | mariadb-git-4155d0937b98e57a93adbe5b5dc20d06ceda59e7.tar.gz | |
MDEV-8402 Bug #77473 Truncated data with subquery & UTF8
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/field.h b/sql/field.h index fdf229edfbb..f8fc7427618 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1854,10 +1854,9 @@ public: packlength= 4; if (set_packlength) { - uint32 l_char_length= len_arg/cs->mbmaxlen; - packlength= l_char_length <= 255 ? 1 : - l_char_length <= 65535 ? 2 : - l_char_length <= 16777215 ? 3 : 4; + packlength= len_arg <= 255 ? 1 : + len_arg <= 65535 ? 2 : + len_arg <= 16777215 ? 3 : 4; } } Field_blob(uint32 packlength_arg) |