summaryrefslogtreecommitdiff
path: root/include/m_ctype.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
commitfb0808c450849e00993fa38839f33969a9daf7e8 (patch)
tree55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /include/m_ctype.h
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parent8760f6907c51e0e20242a53188be5b62029d6f1a (diff)
downloadmariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'include/m_ctype.h')
-rw-r--r--include/m_ctype.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 187c8710929..484cd0a657e 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -14,7 +14,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
@@ -123,7 +123,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;
@@ -998,7 +998,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,
@@ -1086,7 +1086,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)