diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-03-25 15:41:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-03-25 15:41:10 +0400 |
| commit | 69b5c4a4220c8fa98bbca8b3f935b2a3735e19ac (patch) | |
| tree | 4bd30b5c5c29a9c2698f5fa538029ccb9963710f | |
| parent | 2481ed22455d430bce889cb25865b1f878c348ae (diff) | |
| download | mariadb-git-69b5c4a4220c8fa98bbca8b3f935b2a3735e19ac.tar.gz | |
Fixing the return data type of my_charlen() from "uint" to "int",
as it can return negative values.
The typo was introduced in the patch for MDEV-9665 in 10.2.0.
| -rw-r--r-- | include/m_ctype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 104f8694f18..615ee6ac1c6 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -992,7 +992,7 @@ uint my_ismbchar(CHARSET_INFO *cs, const char *str, const char *end) Note, inlike my_ismbchar(), 1 is returned for a single byte character. */ static inline -uint my_charlen(CHARSET_INFO *cs, const char *str, const char *end) +int my_charlen(CHARSET_INFO *cs, const char *str, const char *end) { return (cs->cset->charlen)(cs, (const uchar *) str, (const uchar *) end); |