diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:40:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:41:41 +0100 |
| commit | 4e1d3f83b79cd5f3a920937b462e585fdfb5a35d (patch) | |
| tree | 07e099b50109bd09ff8a5267c5cb5e0bf89597b4 /sql/field.cc | |
| parent | a82cfe109cbc033253ddaba82f9c2de663601002 (diff) | |
| parent | cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf (diff) | |
| download | mariadb-git-4e1d3f83b79cd5f3a920937b462e585fdfb5a35d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 61213fa8569..0f75772e485 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6958,8 +6958,11 @@ Field_longstr::check_string_copy_error(const String_copier *copier, if (likely(!(pos= copier->most_important_error_pos()))) return FALSE; - convert_to_printable(tmp, sizeof(tmp), pos, (end - pos), cs, 6); - set_warning_truncated_wrong_value("string", tmp); + if (!is_stat_field) + { + convert_to_printable(tmp, sizeof(tmp), pos, (end - pos), cs, 6); + set_warning_truncated_wrong_value("string", tmp); + } return TRUE; } |