From: Tor Didriksen
Date: December 20 2010 9:00am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3215) Bug#59021
List-Archive: http://lists.mysql.com/commits/127273
X-Bug: 59021
Message-Id: <20101220090018.4613E341E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4343259884657371343=="

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

#At file:///export/home/didrik/repo/5.5-bugteam/ based on revid:sven.sandberg@stripped

 3215 Tor Didriksen	2010-12-20
      Bug #59021 Valgrind warning in key_unpack()
      
      Introduced by fix for Bug#57687
     @ sql/sql_select.cc
        Add missing initialization of key_part_info->key_part_flag

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-17 12:52:39 +0000
+++ b/sql/sql_select.cc	2010-12-20 09:00:14 +0000
@@ -10720,6 +10720,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
 	 (ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT1 ||
 	 (ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT2) ?
 	0 : FIELDFLAG_BINARY;
+      key_part_info->key_part_flag= 0;
       if (!using_unique_constraint)
       {
 	cur_group->buff=(char*) group_buff;


--===============4343259884657371343==
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\
#   lbx6lwta2tiy2imx
# target_branch: file:///export/home/didrik/repo/5.5-bugteam/
# testament_sha1: b6195029e9f6d7a0289fc4cd4c0f20c813a53dc4
# timestamp: 2010-12-20 10:00:18 +0100
# source_branch: file:///export/home/didrik/repo/5.1-bugteam/
# base_revision_id: sven.sandberg@stripped\
#   ye7l2m5xoja9mj4b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTcWFzwAAZBfgFAQWGP//3Yg
BQC////wUAPO8B3ucAABTUJgJgmyaaRgAINGjExBXqp6j0nlGmQ9PVBo9E0ZDEMjEGmFZR6mjCE2
p6hkMgAMTTIBoDRqamo0ZBoaDQAGgAAAJJEaNIwENNMptAmiaanommGUepYkqQ5g9V7ChPAUZWDO
iGIDJonSQWcGh1XJcyAALGXwPTgooq46zFqPgNwm+2+pauOcLpDSKB1S9Ykqxy2UKoI5ay5ZtNS/
Qj9aGMq25Y+AvzlvyWKw1TRRFIyS1BfhY+mFEBZs7ELRVC0kThEBJwpMx64smkFg5WhIqKCD3R7y
idpBC+jKRWmHLi58oiiZ1b7oYkor/yvY/eqzcuPGr6+EFuWC1vK9e1laSAphHO6IMbCVk8Vnu/nj
K9SurYJs1vM4cRb1HYLhTRdRYsCmqqe6U2xlohMR3U7dc5ARflRlIa6HHa0/iw+F8XHhTS+eDjer
aWxCv7dJo1KThJ1iajRZeS4yzO3lWZUUPsaZiZwMQMpLO4oVDRiTEcEZbEcDbRgwiNIdNnjDHsZI
XpI4RuY1sJGQKBOnkQzGkXROtqTNYY60ARgGACUShCWQ4LmFQZEPwPiJApuCKKBXqXAh5Ri9SGag
A9yUCX7BcyT24pQZzd5WdIaFHok1GJVUL3dGGZzowyq8ggTgZsd5BAGeDhbleYmw8l83eh6JHKvp
WWEofHmQvtlmmXTUj5YMxmr7TF5z3dToeMOSeTU+MRjepzTpQLlzDujVr08g4tb9SbPjeMyRBIr7
LRK+bXX4V7y0akpnWGyK5yQTXsv5JfG9LiUqKD0L6RLBS9HbfC4bBacqIxZ1BMHeV6LSXhg5/etv
azksfWfJs/w7QV3ynJeY5MtWGyxQzzxU4QVyH54LQ52X+NR6TExicfIIuOtpd/O/JvM+SjkD1IfR
41BiqU4Tqe0uztlknZhr+q7XKZVfh1RZ32B/vVJ8HEAOy2IkPIWBLeFWoo13Tfnhsn1wCoPGLOVc
osYNKvFY0YqTzK/htFeHJI4GQd1WFb18SouLc1iK7UXJDKKOa38/ar6C1iOSmdyTtZqN2P6V0+U8
5GKVjQHAwyTUQkQwPcK6DrPV/moo/6DlinKoLJinutmAKZH9QJ/nol8pDB7SLo9bca7As74uZdQa
Um5/dauEsIy0JQnM2S3pkl93on6VEFBquoHGRUx53k1MgRmD7Zqaw7KEUeoFvVh8NAdOrbF7+7Tx
Zzk/URaUCyapDuQ9jqfcVfd+Fm88aPNt9musk4CuNg0ntYFyJ2UQ5YH7NO2UdsU5MvNZBQt3qsBd
itlSJsMlFSXKAno0Wi4SKSpZL/xdyRThQkDcWFzw


--===============4343259884657371343==--