diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-03-16 12:14:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-03-16 12:14:31 +0400 |
| commit | f48dc5ccc7246c5ca9ebad2acc2d1d56a3470f9d (patch) | |
| tree | dad0c76c6303556b7a92431957b08dec4ff8c559 /sql/sql_string.h | |
| parent | c4b268add0475c6633f35eaf8cf4c7fbcad298f6 (diff) | |
| download | mariadb-git-f48dc5ccc7246c5ca9ebad2acc2d1d56a3470f9d.tar.gz | |
Moving the conversion code from String::well_formed_copy()
to my_convert_fix() - a new function in /strings.
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index d89adb6bf51..4c02a46cf67 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -43,14 +43,13 @@ inline uint32 copy_and_convert(char *to, uint32 to_length, } -class String_copier: private MY_STRCOPY_STATUS +class String_copier: private MY_STRCONV_STATUS { - const char *m_cannot_convert_error_pos; public: const char *source_end_pos() const - { return m_source_end_pos; } + { return m_native_copy_status.m_source_end_pos; } const char *well_formed_error_pos() const - { return m_well_formed_error_pos; } + { return m_native_copy_status.m_well_formed_error_pos; } const char *cannot_convert_error_pos() const { return m_cannot_convert_error_pos; } const char *most_important_error_pos() const |