diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-03-13 16:51:36 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-03-13 16:51:36 +0400 |
| commit | 197afb413fcc9f06b5e5e6ef41ce980d108b354f (patch) | |
| tree | 7052fbaa1bf1af1c5c849e8fda4a3a790af09b25 /sql/sql_string.cc | |
| parent | 702fba1511c90ea9c72b6c00122e0f31a05237b4 (diff) | |
| download | mariadb-git-197afb413fcc9f06b5e5e6ef41ce980d108b354f.tar.gz | |
MDEV-6566 Different INSERT behaviour on bad bytes with and without character set conversion
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 9fb462e9a9d..a0b63956ed0 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -922,8 +922,8 @@ String_copier::well_formed_copy(CHARSET_INFO *to_cs, my_charset_same(from_cs, to_cs)) { m_cannot_convert_error_pos= NULL; - return to_cs->cset->copy_abort(to_cs, to, to_length, from, from_length, - nchars, this); + return to_cs->cset->copy_fix(to_cs, to, to_length, from, from_length, + nchars, this); } else { |