diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /include/m_ctype.h | |
parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
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 442133f3ba7..5f65385fd3f 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 @@ -139,7 +139,7 @@ const 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; @@ -1552,7 +1552,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, @@ -1633,7 +1633,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) |