summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorholyfoot@mysql.com <>2005-05-10 02:59:28 +0500
committerholyfoot@mysql.com <>2005-05-10 02:59:28 +0500
commit32024bfc4344d302d6b1ed22563c4dea637352a6 (patch)
tree5ac35c4db9dfbfb7df9e07f32d2f950af2b2ea13 /strings
parentcde9f56b4546aad6780040228bdb7910905e5cdf (diff)
parentd63df3a3d514e5d1ca9d90d7408042a7d23149be (diff)
downloadmariadb-git-32024bfc4344d302d6b1ed22563c4dea637352a6.tar.gz
Merge mysql.com:/home/hf/work/mysql-4.1.ssj
into mysql.com:/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-sjis.c2
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)
{