diff options
| author | unknown <bar@mysql.com> | 2005-07-20 13:40:18 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-07-20 13:40:18 +0500 |
| commit | ada6e563c1844202caf54f4ab4a8d956ce895fcf (patch) | |
| tree | 526110a5b4bb3328d5ad4efab94fd63bcd4d3387 /strings/ctype-sjis.c | |
| parent | f03607ea9e72f726ce11b60826bbf30ebabc2806 (diff) | |
| parent | 5dd494394c43e6e19d4460ae3845a958d62576c2 (diff) | |
| download | mariadb-git-ada6e563c1844202caf54f4ab4a8d956ce895fcf.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
Diffstat (limited to 'strings/ctype-sjis.c')
| -rw-r--r-- | strings/ctype-sjis.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 161f75ca936..76e91b89c25 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -330,9 +330,14 @@ static my_bool my_like_range_sjis(CHARSET_INFO *cs __attribute__((unused)), uint res_length, char *min_str,char *max_str, uint *min_length,uint *max_length) { - const char *end=ptr+ptr_length; + const char *end; char *min_org=min_str; char *min_end=min_str+res_length; + uint charlen= my_charpos(cs, ptr, ptr+ptr_length, res_length/cs->mbmaxlen); + + if (charlen < ptr_length) + ptr_length= charlen; + end= ptr + ptr_length; while (ptr < end && min_str < min_end) { if (ismbchar_sjis(cs, ptr, end)) { |