diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
| commit | 8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (patch) | |
| tree | 3e2c81b24b86a194243fe3e7913393e96de99991 /include/m_ctype.h | |
| parent | c4938eafc594d6d64e5a17be13c337ada0beb63d (diff) | |
| parent | fb0808c450849e00993fa38839f33969a9daf7e8 (diff) | |
| download | mariadb-git-8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/m_ctype.h')
| -rw-r--r-- | include/m_ctype.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 32cede0baaf..f0af80315ba 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -15,7 +15,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* - A better inplementation of the UNIX ctype(3) library. + A better implementation of the UNIX ctype(3) library. */ #ifndef _m_ctype_h @@ -137,7 +137,7 @@ uint16 *my_uca_contraction2_weight(const MY_CONTRACTIONS *c, my_wc_t wc1, my_wc_t wc2); -/* Collation weights on a single level (e.g. primary, secondary, tertiarty) */ +/* Collation weights on a single level (e.g. primary, secondary, tertiary) */ typedef struct my_uca_level_info_st { my_wc_t maxchar; @@ -1519,7 +1519,7 @@ uint32 my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, 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. + and non-convertible characters. */ uint32 my_convert_using_func(char *to, size_t to_length, CHARSET_INFO *to_cs, my_charset_conv_wc_mb mb_wc, @@ -1600,7 +1600,7 @@ size_t my_convert_fix(CHARSET_INFO *dstcs, char *dst, size_t dst_length, @param str - the beginning of the string @param end - the string end (the next byte after the string) @return >0, for a multi-byte character - @rerurn 0, for a single byte character, broken sequence, empty string. + @return 0, for a single byte character, broken sequence, empty string. */ static inline uint my_ismbchar(CHARSET_INFO *cs, const char *str, const char *end) |