From: Bjorn Munch
Date: October 20 2010 9:40am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2945)
List-Archive: http://lists.mysql.com/commits/121271
Message-Id: <201010200940.o9K9e5Z9012040@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1297114149=="

--===============1297114149==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/lowcase-51/ based on revid:bjorn.munch@stripped

 2945 Bjorn Munch	2010-10-20
      Fixed missing cast of arg to my_mbcharlen

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-20 09:30:50 +0000
+++ b/client/mysqltest.cc	2010-10-20 09:39:58 +0000
@@ -5721,7 +5721,7 @@ int read_line(char *buf, int size)
       /* Could be a multibyte character */
       /* This code is based on the code in "sql_load.cc" */
 #ifdef USE_MB
-      int charlen = my_mbcharlen(charset_info, c);
+      int charlen = my_mbcharlen(charset_info, (unsigned char) c);
       /* We give up if multibyte character is started but not */
       /* completed before we pass buf_end */
       if ((charlen > 1) && (p + charlen) <= buf_end)


--===============1297114149==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/lowcase-51/
# testament_sha1: 1ba6eb7b60281febc47485631122ca86af21cb68
# timestamp: 2010-10-20 11:40:05 +0200
# source_branch: file:///home/bm136801/my/morelog-51/
# base_revision_id: bjorn.munch@stripped\
#   ye2ponzyfpc7w6pi
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUb1WBYAAW/fgBAQUGf//1MC
AAC////wUANnnVc3dEt7rZCUSaT1GmQzSPUGibJNlHlPRGgAlJRtT0BlPQRkAAAAACUQAmhR6m0y
Rk9TQDQAADalBqeiaDQDQaAAAAAkimkwDUyU/Ej00CZNTJoGQ9IzRtNmPtas+RUhM+UBaYRQayGl
GZn0ee1RVxvTw1wtVDFVmDjW/C+TDH9adaqHeGIZt8tMk/HtKjFQn3HKbNpUcIjfdMKiESJ9NetE
2pUJE6Ra2qSqAsswfcbSolJBDjOOOIdCN+93CALNSA6aSYXhAS82EOG32MtLRjZyUlufh6pYcvvR
15x8NOQo5hCBKurDXJ47noXCIuIgTdyFRM5Zl3I5MrmCzwKDGNIRoSsQi4rndZayMxROewsi9Lk2
PvabLhZn8OzV6CxNr8iFpXiPaGEuoz2mQ4XWUQNkDYoJc4UWVFUrWtKZ7inTJG1Y4SwIxqlTlWFi
WPgffihWOckUJAH4lYsSrHOklFipYZqLbBZS76JoEkIx5WFpQjyvBRKIvEMnbI10agupzr1e2rRj
EWCuIhCK99fAXsxphi1Svv1uRCMkUU8eUSyyStVQ9DhmaKmtYHF/PldciEstUgeVtknayhGtw5mC
58CM/HhhOTmQeJmM/77ifQHaup0KkpCsuyOHaiz+4IJU4znzBqohhIiE/csTU+uyKjPkNKORY2pV
MZ9ZCPtfoUEitjuDcURlFInO6uzZcxmiQLYbsbDe22dYops+Ct8MJky3nZFS17+Hfll0RosdJQEF
DPe0TM5GDsR/Mm+TcRPXp9fEY6Wg0l/oeaKOIlkDIm64irWRpUV9e6bcG6bAt0xXkKUxgFtU31fu
pyRhyEsDXarz8mEc/3xRDpUQ30hMJX24h5TBa0G0RBSaDOjHflvScg7RBVml5N0VMBN2coQPQFGq
F2knmaSAE2xDKpZqsCqJc3uhJY4IkMwxtJQ69GrqxBTB69glP8kThOvkFLIqduOasyZlQKJO1pUp
S2+L8CK+p1YoV8mAxwikyzqF1LQD08DU+j4PDMSEXPpkpzU8YzBs06tPhdE2F0rmBag1tasMneX2
INXotg0199RLOFIQZVa7TT53pHtRoXlKYOR7hrdYcSJyZKZXcGLTcFZSF5BWHY6F22wt4ELyof4u
5IpwoSCN6rAs


--===============1297114149==--