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

--===============0546017487==
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

 2946 Bjorn Munch	2010-10-20
      Fixed wrong feof check in read_line, see 52019

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-20 09:39:58 +0000
+++ b/client/mysqltest.cc	2010-10-20 09:41:51 +0000
@@ -5733,9 +5733,9 @@ int read_line(char *buf, int size)
 
 	for (i= 1; i < charlen; i++)
 	{
+	  c= my_getc(cur_file->file);
 	  if (feof(cur_file->file))
 	    goto found_eof;
-	  c= my_getc(cur_file->file);
 	  *p++ = c;
 	}
 	if (! my_ismbchar(charset_info, mb_start, p))


--===============0546017487==
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: 6881cc8e469702b3fef262c0c2283fa8d0609e80
# timestamp: 2010-10-20 11:41:58 +0200
# source_branch: file:///home/bm136801/my/morelog-51/
# base_revision_id: bjorn.munch@stripped\
#   e6is8n8qbmhkixim
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU+kL90AAYVfgEAwUGf//1MC
AAC////wUANbXbew3gc8QJRJpNTxT9JpPTAmTU9T1PRPKYjRoASik9DU9T0xGpk0j1HqAGmmgA0w
lEamQmZSNqe1Rk0Bpo9Rpo0BoEUinoEmgepmUZNAyAAAAklNTE9MqemTRqaPKPFNGmTTQANL33z6
Cm+htg5SErLAVQXmo+jOaVefZRRVN/mny0BYvy3MH6KKd7sde/Tw48KO+f0rlOpSrbqwdKRqFURk
bYjzgIYvLqgxEz1SJGE5xglqIVohesHzZEgukrJklIJEhJKRAmEwdTMMZyatsJkGeegp4KIbfgvy
aX6GOao1kZeybz502ol1xuzvJELx+qc6CLuW8yLBC1whVoIjT4mjApPicjFnVc1txN45HLY4Mfkr
uE/sFEocWKhiNIaoONDUqUWuQuqZ5zLDDrZXFBWJhbiZQVahFMGxt6LhQxrkRi1BgTXiJXIlYPln
GozmTxNjpjl1wSZS3BMWBYYKtItJnRWhSX27dGtdhphBKxsOIn+XEoITnAtFfVYo1/oI8OkGiVKL
IiYCEHuMnhi6U7y0u5oSaNiNFoQa9rVaqx45yLBWIhCK7pbjn29ObHB6mzhl35IhDMoqr2peWTho
7XqQkvjaKF7bEx0jRCE61EbQ4Oc9hChXQmNc+y2ZMr3wtIBWfP8DLkHbMziOkN/N/dy31oJZBXqe
YiHl3IhL26kBlNftzNwjtJUgRc2pLHRSPYFmrlByIpWIJjBMwrwUrDi2K/EZFCGXpEtnTnLdU9Ir
0zXZrd2YVaz2RUm40US+9sPg+i01EYNRvS5ZzftpJzFotmBOcdhpZ+5P71PQZoOQ1eYjhEtCBnCk
NonelRhYSRxTXTYmFqNoZjUZgmjw6bHag3B3hu11H7EJ4+vFI8rlwFb1bApDLleHdSFLgcoJDDyR
+NuWzJUb0i1ubIqgvDGqlDyU18h6W3RZJSM47AkV72WFK0yRFt4zhh7zZ4DuU0A1BpyP4ptCx/gf
Obmxw1N+MQzKV3+NNAZeqq5w4m25XTmomXlmV64tLFa8JYzShiLYE+eWNES9oZwbOssPdsF4kUPQ
+PEpUknEdNJG9VDT6cIDwoBzKHIVegw54pD9uRYQTBtNDaWNeBUXMidacWKYFZIrDtKiu2BEUd5O
4/xdyRThQkE+kL90


--===============0546017487==--