From: Bjorn Munch
Date: January 4 2011 1:07pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3135) Bug#59153
List-Archive: http://lists.mysql.com/commits/127872
X-Bug: 59153
Message-Id: <201101041307.p04D7mKb006818@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0488212958=="

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

#At file:///home/bm136801/my/mtleak-55/ based on revid:bjorn.munch@stripped

 3135 Bjorn Munch	2011-01-04
      Bug #59153 mysqltest produces a valgrind warning when the running test fails
      Local variable ds_warnings in run_query not cleared.
      But when we call die() we don't have access to it.
      Set global var. to point to it when allocated.

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-12-29 15:28:19 +0000
+++ b/client/mysqltest.cc	2011-01-04 13:06:05 +0000
@@ -468,6 +468,8 @@ TYPELIB command_typelib= {array_elements
 			  command_names, 0};
 
 DYNAMIC_STRING ds_res;
+/* Points to ds_warning in run_query, so it can be freed */
+DYNAMIC_STRING *ds_warn= 0;
 
 char builtin_echo[FN_REFLEN];
 
@@ -1275,6 +1277,8 @@ void free_used_memory()
     my_free(embedded_server_args[--embedded_server_arg_count]);
   delete_dynamic(&q_lines);
   dynstr_free(&ds_res);
+  if (ds_warn)
+    dynstr_free(ds_warn);
   free_all_replace();
   my_free(opt_pass);
   free_defaults(default_argv);
@@ -7679,6 +7683,8 @@ void run_query(struct st_connection *cn,
     die ("Cannot reap on a connection without pending send");
   
   init_dynamic_string(&ds_warnings, NULL, 0, 256);
+  ds_warn= &ds_warnings;
+  
   /*
     Evaluate query if this is an eval command
   */
@@ -7836,6 +7842,7 @@ void run_query(struct st_connection *cn,
 		     ds, &ds_warnings);
 
   dynstr_free(&ds_warnings);
+  ds_warn= 0;
   if (command->type == Q_EVAL || command->type == Q_SEND_EVAL)
     dynstr_free(&eval_query);
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtleak-55/
# testament_sha1: 6e79e7566703eb30f88c4536a8c9407d204873e2
# timestamp: 2011-01-04 14:07:48 +0100
# base_revision_id: bjorn.munch@stripped\
#   5s6l4lc90xh9ub7x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZijYpgAAb3fgEAQWff//36n
XCC////wUAQ6rx2t1c72G9xsAlEmgJqeTTQ2k1Ho1T2UnpqP1QyaZDyE2RASkJqn6m1PIT1J+knq
AaNNAYgAAAyDQU9E1NMmp5T09I0gA0aABkB6g0ASSQMSnqfqT1NBpp6R6gBoGgAADQJJExGhMmmp
lN6CaaCPSaaaaAGgAErzZQpp66/A7rHUxiYMZVutyfKVEQOVguZJoM1VRIZh43Zp/Dsd4dCiqHnE
ftOT8a0DUneRqqrqMGq3hk2u4PBzi9IjcSQ7/1FDRhklLRbDWkkEE4m0QkEmBx7t9IodwPjWvXbR
Vh06xiiVEudiqx/5MwaRyHqITWWhTG34FBrk0ClFtuNFCwSJpHN053zhp57oiZk5uBYPOphw8HCY
TIt63CgLSdIpGGUlJTNMX0PChEBquEgkJg7mFvJ9bxOe4KSDqrcLRcF4F7/zXnRZTE6tlgVtwEYV
R1ySyKNLekEe8IC9I9cSldhpMU3xVSFaDKVDIZmlSwXP0PNFhEzMOY11YkVVk1UhEi5Z4IpNgkBh
KlimT1DmU4kgySCml4gqQ90gWJsFlUS8U3UkrA5JuiODHkpJkcjwsJEcP6K+YPL7bqgscLKGYNKM
KywM3UsVYboA2Q+fBXNJZQHE94gi4hFXGouuWp94byWFds6HjBQXczLfCFlNtegeFG0IhVcjqIwC
FimznhGcCGO2m1FIOnVmNq0DMpG42DwIYFxfNU3WdabrJXnPKX799KIekEiopxtGeStf9PVvlR7R
M9veD358+3S7KgwrztGASvBamOo7n+/IiF0t22V8Pq/2Y6ILhKTKczqa0F9qBwjlTrEz2lhlyag5
NB65iRa4OcgM77odupW9Z0kZrMwWWDVZK8A/BchZKGZIh2QSMvEtIp2F9Oqus/AzTlUZIkKLU+kB
QlGw8WcBeCpyisOWGBrKb4amgnDRp1XZ6f11RHUOx3TSG9k/QFDB6/fAuTYyeZZtjpMF08mE6OyE
KKl+jLfxv3GiRa4UF7nEoNRvnCtZ2x/b422KUxmNsHSps72MztRTag3O0mLgUErB/RHlTJESg3rk
v57EVhrdBhuTSTRqPaEL6HL0Ktk3CGMOFa5sCGHq7EjsyxbTjqDy8RbK6TWG0XcG+8IwDMEqJJDF
zpFbmNZtvLW+8HSFckRT9moxUTzroSMeMzPhhfMOITjMkMyYkPalkilE7CfTeyoq4qYCYZMnG9qa
7K39aJlz4gV9Yc1JnSIhoL+BRmVuG6xMNylIwoY6fAzWmJf5nPDiNkuSuKImOjAKQhjqGXqud1ZM
IDJDJV2SaMKUzhjW6qVWcHv5QKLxRzbWLcgalU27va2kOkrAmGTV4tovj/nShk4c9Sf0D2ffdpBh
mfXutNsAqCaZiDKv0hidRxxN1J9rEh1cdprFSjUXLB96oDoNgosMhyy5TE7O8O8KBWCms5vZWmq4
DEJmsXadouJ5Lc5mgRzn/F3JFOFCQmKNimA=


--===============0488212958==--