Commit 69b5c4a4 authored by Alexander Barkov's avatar Alexander Barkov

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.
parent 2481ed22
...@@ -992,7 +992,7 @@ uint my_ismbchar(CHARSET_INFO *cs, const char *str, const char *end) ...@@ -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. Note, inlike my_ismbchar(), 1 is returned for a single byte character.
*/ */
static inline 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, return (cs->cset->charlen)(cs, (const uchar *) str,
(const uchar *) end); (const uchar *) end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment