From: Tor Didriksen
Date: May 30 2011 7:00am
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3126) Bug#11765003
List-Archive: http://lists.mysql.com/commits/138429
X-Bug: 11765003
Message-Id: <20110530070047.CFB1726A@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3896062774067375028=="

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

#At file:///export/home/didrik/repo/trunk-insource/ based on revid:alfranio.correia@stripped

 3126 Tor Didriksen	2011-05-30
      Bug#11765003 - 57912 Use memset() rather than the deprecated bfill() and bzero()
      Post push fix: a typo broke valgrind builds.

    modified:
      sql/opt_range.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2011-05-26 15:20:09 +0000
+++ b/sql/opt_range.cc	2011-05-30 07:00:39 +0000
@@ -9045,7 +9045,7 @@ int QUICK_RANGE_SELECT::reset()
       (Now ndb stores  complete row in here, instead of only the used fields
       which gives us valgrind warnings in compare_record[])
     */
-    memset(mrange_buff, 0, mrange_bufsiz);
+    memset(mrange_buff, 0, buf_size);
 #endif
   }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   nkc735j0loztdnf7
# target_branch: file:///export/home/didrik/repo/trunk-insource/
# testament_sha1: 7a5453f3a2350613e3e924a31b242811905bee45
# timestamp: 2011-05-30 09:00:47 +0200
# base_revision_id: alfranio.correia@stripped\
#   3sj55p3r5nlbqvk5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS3KxZUAAYnfgEAQWGf//1YA
RgC////wUAOjzndN7ndnjW5BkkyGkzQAGmoaU8k09TTJ6myg0wyKNGmKbTRpJtRjSGjQAADQSiGp
oANUPU9TammmgHpAAAxE9UyEYhk000DRgmJtENMjEwSSaUzQmU9EeSMnpMjJoAAaaMqrMY/nvgMI
7TddUKABbg3Fc0SpKSqbGzyjQImHb8HwyVKNIojEkfi3fd98qFD0Ht2+Frt3JXMoCKj1jdC++zPH
yKkI7X+9eqZ9DT+p43DuCG0H7C6fSJ6A7g9+DmUgmw5gCt1lM2miZcwydhpzYwudBnJzEQEN8nTF
xhb7U4h1OwsrQNoRU8YZ/tKwWPV6zmxiQjAr64iPJ434s7B9EC9Kj6n2aZF0+7XoWMV21yUqaozo
EIvYFxmkNyusgExHVTtwgyBM8frrk8nE6Smc42GoEt1V2SZeVOIhASSGpWo4qFFYTIi3YPvgKNry
lb3UhCBxYeJk4T5vDlngICNSgbTaf6IjTQk1JyvFIYGq0DRg6YduFEpFwztGQQIUuFgO7fpBvvuo
vEmryGMYCQlSWzOkSXARwFWgYpcFDCiuY+qq8aIiTiZGqlBiwak5tkUrMKCqK9X86VZcuKRVz8Fa
hxByLMsCITRVckJrJ2XWyHi2B2xKHzAxmFwCA+vtHQc52gsCJQyalIJGyDAMBDY/9nXYkaN6hywK
j0mr8xXVJWhN7iMBYtXSIQ6OEWEORxo5m5VwT4QagTHWXm/zBhYcVxiT0L8tbmohIYSJIbGBJzls
62CNj3uLGlaTa0Tr0ADWNe0SdAuOR2mx8stvekARd2MhzZjiHBi17o3q6ilQ7bW6S72CDtXs3rSi
3Xccl3o73ULhiQJByKGu1Mbo1Pe0LDBKAhizwCp+VgO1t+vATBjhT4ftBGzqHLiUmuDDQzBXNsv1
DBmKWsTK4KvYbHu7VvwAeUCZBktCJlj2BXL4zWxsWQNYaa3L9orXV8mkoC3UXBggp9+gKQeASWIp
SGNCG5K+oUq0i9XSzfl1RRlupwoUSrKRSrRM1eAtkGVQewjnhaqXuEyTSqalBVTKzXF1bAuBOG1z
0qOGoD9SGCpUKp1w5cLDQFFGw4ZIhWI9/PdizCR8pbwnb5Fj2qACGUuERJZsYTMLX5GBEeeocRF+
ZAzicO2rK9sayxFYpsK4s48CBdiJqM4dACDIvMJc/ujbbkeRqlQG4ClcD9CreCrLchmOKBf7R0KT
YLAiurgKgIo1HHd2z2GWA7o3kk9WWyhPoKSgHMvEBYs+onMBDSP6ILJXA+w+RdyRThQkC3KxZUA=


--===============3896062774067375028==--