bzr push into mysql-5.5-bugteam branch (tor.didriksen:3214 to 3215) Bug#59021

[Tor Didriksen]

 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
 3214 Sven Sandberg	2010-12-19 [merge]
      Merged BUG#49978 with (BUG#51264 + BUG#51925) in 5.5-bugteam.

    modified:
      include/CMakeLists.txt
      scripts/mysql_config.sh
      support-files/CMakeLists.txt
=== 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;

No bundle (reason: useless for push emails).