diff options
| author | unknown <holyfoot@mysql.com> | 2005-05-10 02:59:28 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2005-05-10 02:59:28 +0500 |
| commit | 3db2d3d895dce92501875335ff35c005e34ad5a0 (patch) | |
| tree | 5ac35c4db9dfbfb7df9e07f32d2f950af2b2ea13 /strings | |
| parent | c90b0ab57721382ed3689e1dfbaa338793df07a0 (diff) | |
| parent | 163b8bdc379b699268a0114ff66ad4d64f116eeb (diff) | |
| download | mariadb-git-3db2d3d895dce92501875335ff35c005e34ad5a0.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.ssj
into mysql.com:/home/hf/work/mysql-5.0.clean
BitKeeper/etc/logging_ok:
auto-union
strings/ctype-sjis.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-sjis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 9b7fd5097fa..a7d75da42c9 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4591,7 +4591,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)), { const char *b0= b; *error= 0; - while (pos && b < e) + while (pos-- && b < e) { if ((uchar) b[0] < 128) { |