From: Alexander Nozdrin
Date: December 21 2010 12:23pm
Subject: bzr commit into mysql-trunk-bugfixing branch (alexander.nozdrin:3462)
 Bug#59060
List-Archive: http://lists.mysql.com/commits/127408
X-Bug: 59060
Message-Id: <201012211223.oBLCNqfu012898@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2859303906799191183=="

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

#At file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/ based on revid:sven.sandberg@stripped

 3462 Alexander Nozdrin	2010-12-21
      A patch for Bug#59060 (Valgrind warning in Protocol_text::store()).
      
      We should not assume to have zero-terminated strings.

    modified:
      sql/protocol.cc
=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc	2010-11-18 16:34:56 +0000
+++ b/sql/protocol.cc	2010-12-21 12:23:49 +0000
@@ -983,8 +983,8 @@ bool Protocol_text::store(const char *fr
 {
   CHARSET_INFO *tocs= this->thd->variables.character_set_results;
 #ifndef DBUG_OFF
-  DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %s", field_pos,
-                      field_count, (length == 0? "" : from)));
+  DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %.*s", field_pos,
+                      field_count, (int) length, (length == 0 ? "" : from)));
   DBUG_ASSERT(field_pos < field_count);
   DBUG_ASSERT(field_types == 0 ||
 	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   6h8ammcro70a4pac
# target_branch: file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/
# testament_sha1: 461e0e0755309c8d94f2f8d0380fedb9852e4122
# timestamp: 2010-12-21 15:23:54 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: sven.sandberg@stripped\
#   hnivuulyohzch1v4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQL6nLgAAZZ/gAAQEABad///
9qFXgL////BQA/a3uORx72Pb3m3AkkmlHipnhJmTKemRlPSGkANqPSNG1PUwSiCamnpiTCaNUep+
qHqbUDRhGgMhiAyIEYgmI1PTVA9PVPUPUDNEPUPSaeoAbUUnlT9U09Hqh6mgyeo2poDIAMjTQGjC
UUxCeUxQ2p6noaTanlPU0AAaBoAI4+Q3/js6S+rZjiZ375oD9TG55thcDDTh1S/kWTXLY5RU3c8B
0dQy+1itDEph9Wfm5Gx5VpDn/b88OedjKl9yCTVCqt7cNq3s/OEu/cj+TBVS2oav0WSh6N37qwOC
80roZsoViP78QLelXR6CTVZVJ2UbrJYazSkZ5rkmVbSw6MsJudK9WFVBeIOQRVKYtupRt3SYzGrU
gJqZBsr5kJNEYGSDTEWKyggeMnPUuICA30M1Pa7xPeOlOrXpB+2w8Q1UjaJZC5RuOyvYJAjKKTIE
zohJgjAdAymtQ122gWtaB1ZiFbBRnnHCIO3UOoTCzU1Z5hoXWoaYhPJRTXSsfmweVJEwwcJAdUNk
WngnhsEhPFhlR+r17jTdtRiNTA67LriNc3744QFnSrxutrTWkMxHHMb/ElfrKVHAFFC1DExqLxlt
wsEp34GaqPTFqBrRJZ9YOApjvqwiDeIJaJsD5msYqJxF5sFAjHg6Lql0DLWTuWxqQHlUPcwoqNEA
NBCBoWUuI+NU/PwtVBDf9Pgxu4wJnIuhkxw8oh/p6fx/KZ3Hjs39PHNRTMhiDf2wGI4MbDLEWO31
3pfdIlyJYAwKxtfHlwp7hUxyL1A8ZkeOzvIJHWFWvPqK7F8jMPXwYq+tBgHBww30Ltcn2X55oLac
Fc+FzAspIFPJfRfXRNmp59qqx/OcSA2DBaStqKgW1YnA3JS03QMVN8P7J4taCd74FhQMzUzwdzFk
UIBlw0x7C1XwzNF+q4+jraX/OLFpVBpHJlOgz5slrdBqjqJyMPcBzoffUTusnwt0wlO2If1TlFZ3
cm9+Tn3VECnZndt4VrFD9pCUdb1o8nltTMG4TXh2T7Cjcoe9RUppL2MC3V7kuZalUi8ajSlaqicV
yCfRL4P6jhjDEPYEa0nrdk5zkHukWW4vKw9izOEwTYDAaLmUlgiClOXpoAN6Y0zQyAORuBY/CYc7
FwMNFgHpAuFpQKS114sJgVGFUCgn1u0pliDZhKEhOwxcsaAToH5S8OyRH4YrtKX+CkhytxuKqJt7
GWAXazqRe32ZFaP02ky1OkwhAkwH12KIRIiXKMQxW0EYT6gNGNJdXHizYC/KNo5B8Xof8k2X7i+4
9crvQAtBvx5JDSOtYiRkwHU2pzmY5uoaQcxZxoROV5GFnpmQalgk0VY1MS/vNMfrpK8s8sElY5mz
nTsRlbkomQWo67Q4jwH0GIVm0mmNWScbOSXAPJqR/4u5IpwoSAF9TlwA


--===============2859303906799191183==--