mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Merge with 4.1 to get in latest bug fixes
This commit is contained in:
commit
071001950e
144 changed files with 4506 additions and 1997 deletions
|
|
@ -4581,14 +4581,19 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)),
|
|||
*/
|
||||
if (((int8)b[0]) >= 0)
|
||||
{
|
||||
/* Single byte character */
|
||||
b+= 1;
|
||||
/* Single byte ascii character */
|
||||
b++;
|
||||
}
|
||||
else if (issjishead((uchar)*b) && (e-b)>1 && issjistail((uchar)b[1]))
|
||||
{
|
||||
/* Double byte character */
|
||||
b+= 2;
|
||||
}
|
||||
else if (((uchar)*b) >= 0xA1 && ((uchar)*b) <= 0xDF)
|
||||
{
|
||||
/* Half width kana */
|
||||
b++;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Wrong byte sequence */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue