diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-02-24 13:12:03 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-02-24 13:12:03 +0400 |
| commit | ff2d92b17d600f83b9ad4baaa96ede7c9c08801a (patch) | |
| tree | bc2c91c059dc37b7dfd8273a3bd34bf33bfe9e1e /include | |
| parent | 28a36f617fbdde1125614e16a642c1b15ced916b (diff) | |
| download | mariadb-git-ff2d92b17d600f83b9ad4baaa96ede7c9c08801a.tar.gz | |
MDEV-7231 Field ROUTINE_DEFINITION in INFORMATION_SCHEMA.`ROUTINES`
contains broken procedure body when used shielding quotes inside.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index a55222682b0..ee49e94ef99 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -533,6 +533,7 @@ struct my_charset_handler_st extern MY_CHARSET_HANDLER my_charset_8bit_handler; extern MY_CHARSET_HANDLER my_charset_ucs2_handler; +extern MY_CHARSET_HANDLER my_charset_utf8_handler; /* @@ -889,6 +890,18 @@ uint32 my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, const char *from, uint32 from_length, CHARSET_INFO *from_cs, uint *errors); +/** + An extended version of my_convert(), to pass non-default mb_wc() and wc_mb(). + For example, String::copy_printable() which is used in + Protocol::store_warning() uses this to escape control + and non-convertable characters. +*/ +uint32 my_convert_using_func(char *to, uint32 to_length, CHARSET_INFO *to_cs, + my_charset_conv_wc_mb mb_wc, + const char *from, uint32 from_length, + CHARSET_INFO *from_cs, + my_charset_conv_mb_wc wc_mb, + uint *errors); /* Convert a string between two character sets. Bad byte sequences as well as characters that cannot be |