diff options
| author | unknown <monty@mysql.com> | 2004-11-09 21:47:46 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 21:47:46 +0200 |
| commit | 96bd70c7750aa2a9e39eaeb1da917f89f04173b9 (patch) | |
| tree | 50aeda8eac9d7305cd0eb80d8479f992cd179e02 /strings | |
| parent | 591feb1fbc3632da62620e81ac39e8a0e307aa84 (diff) | |
| parent | cd16e4c9c750a5bddfcecaa849dc277445aeaa5b (diff) | |
| download | mariadb-git-96bd70c7750aa2a9e39eaeb1da917f89f04173b9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
sql/item_subselect.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
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 */ |