From: Mattias Jonsson
Date: December 1 2010 11:21am
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3533) Bug#56380
List-Archive: http://lists.mysql.com/commits/125638
X-Bug: 56380
Message-Id: <201012011122.oAUGrICh020292@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6724788625614584431=="

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

#At file:///Users/mattiasj/mysql-bzr/b56380-51-bt/ based on revid:nirbhay.choubey@stripped

 3533 Mattias Jonsson	2010-12-01
      Bug#56380: valgrind memory leak warning from partition tests
      
      There could be memory leaks if ALTER ... PARTITION command fails.
      
      Problem was that the list of items to free was not set in
      the partition info structure when fix_partition_func call failed
      during ALTER ... PARTITION.
      
      Solved by always setting the list in the partition info struct.
     @ sql/table.cc
        item_free_list is not set if (!work_part_info_used) and
        fix_partition_func failed. Which may result in a mem leak.

    modified:
      sql/table.cc
=== modified file 'sql/table.cc'
--- a/sql/table.cc	2010-10-01 11:39:04 +0000
+++ b/sql/table.cc	2010-12-01 11:20:46 +0000
@@ -1867,8 +1867,8 @@ int open_table_from_share(THD *thd, TABL
     {
       if (work_part_info_used)
         tmp= fix_partition_func(thd, outparam, is_create_table);
-      outparam->part_info->item_free_list= part_func_arena.free_list;
     }
+    outparam->part_info->item_free_list= part_func_arena.free_list;
 partititon_err:
     if (tmp)
     {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   2ugtweya0dltcrys
# target_branch: file:///Users/mattiasj/mysql-bzr/b56380-51-bt/
# testament_sha1: 3ac06e8ddf94226e7cdb31ede6a9f9faebd9a6de
# timestamp: 2010-12-01 12:21:42 +0100
# base_revision_id: nirbhay.choubey@stripped\
#   w2f0j3g5yzok8z9x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVO3zNYAAb1fgEAQeGP//3I3
3IC////wUASu7wFAHQABEJoo9NR6mIaek009QaAAGgNGQA5gAJkwAJhMEwhgCMAEJT9FPU9pR6Ia
eo9QAAAAAAAieqaDUMho9QMI0BoGgMhiaMQJJAjQjCZGgQwmppT/UT1NT9ETBo1P1KwbUVQnejiN
MgIVQJGCxC8IRGAd5zU1IQ4RTPieVOoGSugAyJDW6FkAiBwQUWsSX8Rla0pJrk5MdU7EyHGW2ggE
wCHL7IMOvSYTzBnks6gM0hLBbgnJAnKSWaMzRhhbkrVT/jBOZFvifLXNaRHIW+vXC3HLV33+S3ae
KmsfDyIsYl2G/SitNcmSu8bAJxlKGNUg3srdjodIqOlusUyByZA5whz3LF4tr1KhT2KC+XOrAVkc
1ZpFYNMsXOkS5sK828npWJZQjBBjEX507uMueddOKmaf60R2+GIzLb81hZQbtG+qzWy3GdYiaAeF
Jz3jjXQRuosucLmomulvwq9Arqq6FxT5mrjqxLYEqN1DfdeOnyWipU4O47rtmxr5TFc7O4c8Y36j
USD3UrSr/L1tji9fiXFMvFLj2tpAqJ4k0cgoc1UoRe/AxYKRIoYVLI2giYKygNEvsTRcrnGo1zxo
qfrscqTDQX3Yk4WwFqLlU4fX1ysKeymOKVZf5X3LZhanSeW/FqZGs8FOm5ww6OmDWW2NQWvIEB6k
9RdQzh1KKKW0epucbKP+bE/Z9fTkSA7qo+5TYww37cXf4KX7kP7P5IFNJId9yJ+o+XhcWmWlznMM
l09z1+sT41U5CiG8+Bw4HIf52efnpR9foBq6qgeFKgu/tnjLGtz89nz0+7I+zAVuGAlm0G/DIHqP
r+ZPPI7bchvmOv2eyxVSPKfejojabg9W9S6853hRP7B0bLCuhcKWksHMBwVsEivBvEVZsq/65zM1
zY87rIFpQsp0p8FqMFlq1FYpbJxVmdnE2MQhBJe3Pi7sfpDkqpfDpIszSWCwAhdONAMLNdadoOQX
pCE6Y7RtN/AtOg0c5QvsEcNlatSZWZxjZy5TUaYpgcuC4ijI5Zrcru3R3mu3ImXf3Ds0h1O8TyDd
+TOhB6cvTsvQWjj1URRcZtuB21MFe3296FgpLXwcg4uv76gaOJ5GKMlAgFPmFjyc2aNVH9btU4LJ
MNJVdA2oo6woR0vJ0fBePgBnkN1WqrIIz/g3BYD3Lvy1dDkjSA5Yph9b7GYcZ0ybiKy+WhzMIc5O
YuvWn/x+wzuFs2TzQU51nWwpoLH6gmUM9yc1yZCfW9UqKIsI8aZqg/J8kEVNFDJl8lo4sGlWumV9
17vvQt9YmAZR9/oBI9wNAd7FzfpGOxj8VbzlcGFObmTdubkw+5UFfXhbxj9qb9JKCodwVQJ/nuUK
8giK6zzcSv8qawtn6/zr0TuqVCrZFVAyMxOwIfLBz2ycfB4DpBo1leEcsV1cYaAao9GqQeno1FLW
GaCpDnhWOOSfFXQL61kQjlviQ4xY9i21XUViiFyvvUK3Bx9H3SQaMB00PRTWFq2M5bVF6lUgxx3i
noWyZ9vEUOGkGTXUb41fRYa8FcG1QUPRVif75Gv9FNXLwyWbMmgg3Yp5Bg+6vX6ihYSCrKP8XckU
4UJBTt8zWA==


--===============6724788625614584431==--