From: Mattias Jonsson
Date: June 14 2011 9:50am
Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3195) Bug#12589828
List-Archive: http://lists.mysql.com/commits/139184
X-Bug: 12589828
Message-Id: <201106140950.p5E9ogFU017539@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0415575482=="

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

#At file:///C:/ade/mysql-bzr/b12589828-trunk/ based on revid:mattias.jonsson@stripped

 3195 Mattias Jonsson	2011-06-14
      Bug#12589828:MEMORY LEAKS IN PARTITIONING TESTS ON TRUNK
      
      Moved from non-safe c_ptr_safe() to c_ptr() + using lenght() instead,
      to avoid mem leak.
      No test needed, valgrind_report failed for main.partition_explicit_prune.

    modified:
      sql/partition_info.cc
=== modified file 'sql/partition_info.cc'
--- a/sql/partition_info.cc	2011-05-26 15:20:09 +0000
+++ b/sql/partition_info.cc	2011-06-14 09:50:33 +0000
@@ -115,11 +115,11 @@ bool partition_info::prune_partition_bit
   do
   {
     String *part_name_str= partition_names_it++;
-    const char *part_name= part_name_str->c_ptr_safe();
+    const char *part_name= part_name_str->c_ptr();
     PART_NAME_DEF *part_def;
     part_def= (PART_NAME_DEF*) my_hash_search(part_name_hash,
                                               (const uchar*) part_name,
-                                              strlen(part_name));
+                                              part_name_str->length());
     if (!part_def)
     {
       my_error(ER_NO_SUCH_PARTITION, MYF(0), part_name);


--===============0415575482==
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\
#   48ri7wk1zyv0uieg
# target_branch: file:///C:/ade/mysql-bzr/b12589828-trunk/
# testament_sha1: 46f929e37847fe7c83e350fa5bfad57288be1189
# timestamp: 2011-06-14 11:50:39 +0200
# base_revision_id: mattias.jonsson@stripped\
#   7jfihnup06d9i3we
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZwltTMAAZffgEAQWH///3K/
3iC////wUAQBBq1NDS9swJRCEYCYU9MFGT0g1NNMTCaeiMag9QMlNMTE0U/QRpT9T1T9QaACMJiY
RowAyIE2oU9NBNNMmgyNAAAAA0BzRkxMAExGBGmBBiMEyYBGCSiRpPxU9T0Gk/UEZMJo00GmjEBo
GmQzKrC4X8eSU6awunWStUC264bKLfpoRopF7sjr8J1VU/O4N7s6lC6iprmOg7t/izt+a3m6QXd+
eDCr41aXWZ3nN61IlM23CuK66xroRiiLFJo9m4X7UJmpSbyoQ35CakhNhqmym+B2EmjGyTGtEFJW
cohDUsTrLXkTJahEZFzJj7tJ9bFtkEIGJcpDwkwQLOC5vT2BrJ3utYIzGOtwIaVTzD16V3X4QuK0
BnP7F8J89GgKEmoPxmxQfrFOEb0EQYjUf0LXTAidwgLccsEZdsBogxrUsWBQ0vp3XWWksoAa1CVm
phcrdFYUhcJGZmIkmxGFdlV5gwgPNtAVbpoV8hqngyW9HCoRFYuD/d15R8wKTPp26RjEXyDi6VIq
iz2GVCBNwuoMMy99NJuYBFgx2Kg6qAkNOrOcLeMTGJsDJDAwBqjA2STQFvLBgulQFEYigGbarsbj
lUUOBUYUmKL2qKznsqYTVbKmdiikVAuuD1RX1eMwPwLBtPqaadqxSzNUu87upX0Q9d+aNUUbq93f
H77LUUKvusqEn8fSJpdF7LQ0vZWhLSvootGtcUoAoGY6ft59zw+fLqeDYO5TpaW5Hdkd8iIZ9osy
NCTJ3j2VhTBR2xgj6IZ01KIXdlNgVk9PEfQfyQv61uZ10DDGb2Xopyf1V46aEpRCRkHkiX+mGQnL
GTOtzkKrg0UVFpSdGoxlhDVBJgUF8J4cC/xVUQlWPcvH4Wt5sDklaroi9kUQPDXZPd4vPfhBR5Ly
WvVuefXzNIj072KxbGFGuc6TQihNxVv8c2dywBwajaxY7TE5l1mBER+ifznzWWgxNarkko5jDYsi
CuktZMwpvLAWKhMJwfSpI9KI1EFhjn28RxreBocLpmhvPF9coELGN+PrrYIwLIhygYVAyPv6NiYm
QhmoXITTDQGHreEoSsB2dEFK1XKPImZVRDDiCZ7UsT0OgVl3JGEDpzn4uSPLNAUkushgRVYs6ohx
VoJxIvPg4iIshDM0gDKRCIdBU8QubY8FOQX23zYc8lMFzQwsGiGIjvcIlqEJt6QwGrCNVjRIRTRK
lmCqnBi9OWBARdDD/YyUkr0nLrC7Rm1yLUDI0YxEOy8ihtGAdgM4Z87HU6K8crI6hZAFcIqXEhcM
bZctogkMG4AtBuTJGvwJOm0AoEpAmEro2k0RejzXkEekK2e0s1qV9mVIfMQBoXH0oBMojRja9Rq4
IJGeMeg09YncjB6mnocZhSUSq4E9MwLOKkEE8nFjHDsFBjKB9c8Bf4u5IpwoSE4S2pmA


--===============0415575482==--