summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorholyfoot@mysql.com <>2005-05-10 02:54:49 +0500
committerholyfoot@mysql.com <>2005-05-10 02:54:49 +0500
commitd63df3a3d514e5d1ca9d90d7408042a7d23149be (patch)
treee71412ed8176af44c6dd242d7357fbe695e372f0 /strings
parent2f9a28b4cca7c4ed1d64f5bb72549a6eea6e07e4 (diff)
parent1851a38b2f1bd0d2be665fa1abbbd17e4d37fd64 (diff)
downloadmariadb-git-d63df3a3d514e5d1ca9d90d7408042a7d23149be.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.ssj
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 35182db3345..b018e148ffe 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4576,7 +4576,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)
{