diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-01 15:14:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-01 15:14:35 +0300 |
| commit | 9f7216aa13ec85e4200730544ef54f3a1323b408 (patch) | |
| tree | ec345174f2ddfe854a178732da0ac43a475b47ed | |
| parent | 1db5dbff156e8e8e58f78e95acba1c9f75e2cc5f (diff) | |
| parent | c34cb165881e18234543b12bae9e2f96548ba7d3 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-20368.tar.gz | |
Merge 10.5bb-10.5-MDEV-20368
| -rw-r--r-- | strings/ctype.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype.c b/strings/ctype.c index c9977824176..46951c3ae1f 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -921,7 +921,7 @@ my_string_metadata_get(MY_STRING_METADATA *metadata, /* Check repertoire: detect pure ascii strings */ -uint +my_repertoire_t my_string_repertoire(CHARSET_INFO *cs, const char *str, size_t length) { if (cs->mbminlen == 1 && !(cs->state & MY_CS_NONASCII)) @@ -948,7 +948,7 @@ my_string_repertoire(CHARSET_INFO *cs, const char *str, size_t length) /* Returns repertoire for charset */ -uint my_charset_repertoire(CHARSET_INFO *cs) +my_repertoire_t my_charset_repertoire(CHARSET_INFO *cs) { return cs->state & MY_CS_PUREASCII ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; |