diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-03-02 18:24:22 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-03-02 18:24:22 +0400 |
| commit | b1b6101af2f69871ff3f3049c6e42e95ced20544 (patch) | |
| tree | b395810839d006b6101352b2c8f65984ffd28d92 /sql/sql_string.h | |
| parent | 7047bef1ef8c2cf04932b4b1a51a479a746d9a40 (diff) | |
| download | mariadb-git-b1b6101af2f69871ff3f3049c6e42e95ced20544.tar.gz | |
A preparatory patch for MDEV-6566.
Adding a new virtual function MY_CHARSET_HANDLER::copy_abort().
Moving character set specific code into the correspoding implementations
(for simple, multi-byte and mbmaxlen>1 character sets).
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index a40ac536f04..d89adb6bf51 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -43,10 +43,8 @@ inline uint32 copy_and_convert(char *to, uint32 to_length, } -class String_copier +class String_copier: private MY_STRCOPY_STATUS { - const char *m_source_end_pos; - const char *m_well_formed_error_pos; const char *m_cannot_convert_error_pos; public: const char *source_end_pos() const |