diff options
| author | monty@mysql.com <> | 2004-11-09 04:06:44 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-09 04:06:44 +0200 |
| commit | 87af3d9113cac7dca7355b8e01fc3a734c7b9e1d (patch) | |
| tree | a936b651bfe5aa74bd01c17224531d16117c29d9 /strings | |
| parent | a3f4bd28ace3b80dcc6c908e7de1b998c52b0e59 (diff) | |
| parent | 2bba55b57fba78b018fe3ed64bafb7ea4b0c9d5c (diff) | |
| download | mariadb-git-87af3d9113cac7dca7355b8e01fc3a734c7b9e1d.tar.gz | |
merge on pull
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-sjis.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 4176ff2e538..a8b5394f8c5 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -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 */ |