diff options
author | bar@mysql.com/bar.myoffice.izhnet.ru <> | 2008-02-29 17:56:50 +0400 |
---|---|---|
committer | bar@mysql.com/bar.myoffice.izhnet.ru <> | 2008-02-29 17:56:50 +0400 |
commit | f83cc8e6db90c96db1eb336f690b8a2af3d49e94 (patch) | |
tree | 383fd33306f77670825adcb8b08abae9dff732cc /sql/sql_string.h | |
parent | ef9579619d12a6d9034cfbdfdd90cbd6e5a314b9 (diff) | |
download | mariadb-git-f83cc8e6db90c96db1eb336f690b8a2af3d49e94.tar.gz |
Bug#23924 general_log truncates queries with character set introducers.
Problem: logging of utf8-incompatible binary strings didn't work
Fix: hex-encoding of incompatible sequences.
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 128ed749b5f..b4d76a1779a 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -37,6 +37,9 @@ uint32 well_formed_copy_nchars(CHARSET_INFO *to_cs, const char **well_formed_error_pos, const char **cannot_convert_error_pos, const char **from_end_pos); +size_t my_copy_with_hex_escaping(CHARSET_INFO *cs, + char *dst, size_t dstlen, + const char *src, size_t srclen); class String { |