diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-10-10 14:36:09 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-10-10 14:36:09 +0400 |
| commit | 5058ced5df7a4ee3ff011577829fb2e4a6f47843 (patch) | |
| tree | 8f90cd07e71cef5dc09adfd825712f812f978f57 /sql/sql_string.cc | |
| parent | a6f032af5778018051d41fc8ba7e9c983b4b7fbf (diff) | |
| download | mariadb-git-5058ced5df7a4ee3ff011577829fb2e4a6f47843.tar.gz | |
MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2
Part 3 (final): removing MY_CHARSET_HANDLER::well_formed_len().
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 4bb9f835211..49442260704 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -1018,10 +1018,10 @@ String_copier::well_formed_copy(CHARSET_INFO *to_cs, { m_cannot_convert_error_pos= NULL; return to_cs->cset->copy_fix(to_cs, to, to_length, from, from_length, - nchars, &m_native_copy_status); + nchars, this); } return my_convert_fix(to_cs, to, to_length, from_cs, from, from_length, - nchars, this); + nchars, this, this); } |