diff options
| author | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
| commit | e0bf844c8ac4cd1efc9547637baac5201775a1c7 (patch) | |
| tree | a936b651bfe5aa74bd01c17224531d16117c29d9 /strings | |
| parent | 20c82f5c014e9902f234f925a218895f3b91b154 (diff) | |
| parent | db67626196992923be83c12302d03cad35cf80f9 (diff) | |
| download | mariadb-git-e0bf844c8ac4cd1efc9547637baac5201775a1c7.tar.gz | |
merge on pull
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
configure.in:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.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 */ |