From 1851a38b2f1bd0d2be665fa1abbbd17e4d37fd64 Mon Sep 17 00:00:00 2001
From: "holyfoot@hf-ibm.(none)" <>
Date: Tue, 10 May 2005 02:15:59 +0500
Subject: [PATCH 1/2] Fix for bug #10493 (SJIS fields are not correctly saved)

---
 BitKeeper/etc/logging_ok | 1 +
 strings/ctype-sjis.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 2143d0f2492..246de2fffa2 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -75,6 +75,7 @@ hf@bisonxp.(none)
 hf@deer.(none)
 hf@deer.mysql.r18.ru
 hf@genie.(none)
+holyfoot@mysql.com
 igor@hundin.mysql.fi
 igor@linux.local
 igor@rurik.mysql.com
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)
     {

From d1e9d9b981bbc6cc1c4412b0d17097b56c2e19e3 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Tue, 10 May 2005 00:40:41 +0200
Subject: [PATCH 2/2] Fix for BUG#10070: Make the test not to produce warnings
 if InnoDB is not available

---
 mysql-test/t/range.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 3d3d4748fe3..b51a79fba77 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -448,6 +448,7 @@ explain select * from t1 where a='aaa' collate latin1_german1_ci;
 drop table t1;
 
 # Test for BUG#9348 "result for WHERE A AND (B OR C) differs from WHERE a AND (C OR B)"
+--disable_warnings
 CREATE TABLE t1 (
   `CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',
   `ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',
@@ -456,6 +457,7 @@ CREATE TABLE t1 (
   `FUNCTINT` int(11) NOT NULL default '0',
   KEY `VERI_CLNT~2` (`ARG1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+--enable_warnings
 
 INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),
   ('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),