From: Alexander Nozdrin
Date: December 21 2010 12:22pm
Subject: bzr commit into mysql-trunk-bugfixing branch (alexander.nozdrin:3461)
 Bug#59060
List-Archive: http://lists.mysql.com/commits/127406
X-Bug: 59060
Message-Id: <201012211222.oBLCMx1c008294@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1862457310407700817=="

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

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

 3461 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:22:50 +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 ||


--===============1862457310407700817==
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\
#   z6sx0hkva2rkavcy
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-trunk-\
#   bugfixing/
# testament_sha1: a3984a134909a15ddfe85ff28c0ef8ad806239e5
# timestamp: 2010-12-21 15:22:55 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: sven.sandberg@stripped\
#   veucc07xpv3sq9b1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWahYf20AAZX/gAAQEABad///
9qFXgL////BQA/a3udVXHdYcN0EkpopmqfqeaVPanlNkaKeap+im1H6UwmGSaNPKA0QmRkyjTyIy
T1NNMIADQADRkGQieoaBDEU/TRRp+ig0AaDQyMmmhzCYBMAJhMJpgAAEyaaBhJQhT9TDVPaUybRH
qbSNMhoAAAAOryi328dwiuqusXRtgQE06E3XJZiAQM1/e/a5EDx7FGDTz9mA74ztsuZYBkof8N3a
0hT12I/Zls33/rfa1a+xBKChVOKZWHF/vKG3IU2tAMyqWEn5HAwM+T7XWLz1Piy5EhQEfveZ9GOo
jps6496vsFk+sBFYVpHU/SkysaaJtl0vQlfqE2Rb0DhETADMOSmZpuKbEVKpyqob+igiF0oHnYo5
bRqXWYIDVUaUmfU5AgDRS2cIIf2eod9EMZ79IPl8g2tJdwsrtYZDBXiJ9tmAqBGMSBy20ElgUmy5
BQJrQu1YitQDlGIRBOoKwNukKGDIGuKlFbkG64KNuHgWFB4Ig1G5JxDKLBISF9jhpgw8GuYG3CuE
RY/leOGyckEksg2YhUx0MpzBq8L9yXzlQVCRvBaxHeH4bxRJjrYL0zGHGsYmjhbcaRmi08BQZ2sa
K4h+KCEIKhuMa7WxLANSw8XNDKcZRKUBQH3lVzsmoeWgJrTCdqjcblEZmKKkA4GgdzOspdQ+NdWn
TkqB/R1/BoaFybhj6WTHr+cZDy5e8P+fBz56/SXnk+NT0MO8+Di4gDAVi2dvl4pEmtSODSVDW8v7
woyY41xAwmR523jo4KuImw0ZilfavtZd/jvHRYkV+VwYhd5Jpk/C4hnptnsgZI9FiSH68ZpFqgxl
GqO1ns2ZlInS5JJQwFo5Tl40CzuLziAUV6Xb9ElKAKWHYh49BUE5YOVWOBDmgWtzLzikuHSg59WT
yqmZd9tMqtUS0amKCDFXpWdrrsFpWTqcKAHoizTjZnuccNVFto8nynZzbC+CH51DltZoPppDKqUQ
7SIfXCqflCWXMxoC5+onuFFnpTR6GKB+7sWSCddEpQOTh8bMlqbrCb7y4RdxbTi6gvCSbLDRcbCO
KZpRR6y4yhuF6mGcHg/cOCEbMxHKkMVWe94G1q4+mQDsLRwkIX7n5u4mRzEXFApKWLMhCEhugMRE
K8n5E2weLkKhQ1dCRsYrsKIAY9qHOAfxJDgqc1KcNUxzl9ok15nZiiFGFHDiKkvi+mhlIidhTjkg
IUk+ZAxFHG0TAWcwBvx9wNJmtlBo7qLR9xGiZD4pJrMymir6I5ga9WbfgzfT+WjEykVMGhrFLHGn
GUkc8cGKQeB2EOGqQcynjgGJKkFAjNy0FLaM1RWeeaEg++D3NsuTOYT0pFWoqASWaDgNgUoGHWqx
yKTGPK2DBlLH6HCqiBIQYT/4u5IpwoSFQsP7aA==


--===============1862457310407700817==--