bzr commit into mysql-5.1-mtr branch (bjorn.munch:2929) Bug#56647

[Bjorn Munch]

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

 2929 Bjorn Munch	2010-09-10
      Bug #56647 Valgrind warnings for memory leak in mysqltest.cc
      Moved an init_dynamic_string() from before to after potential die()

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-30 09:26:40 +0000
+++ b/client/mysqltest.cc	2010-09-10 11:08:06 +0000
@@ -7309,11 +7309,10 @@ void run_query(struct st_connection *cn,
                            (flags & QUERY_REAP_FLAG));
   DBUG_ENTER("run_query");
 
-  init_dynamic_string(&ds_warnings, NULL, 0, 256);
-
   if (cn->pending && (flags & QUERY_SEND_FLAG))
     die ("Cannot run query on connection between send and reap");
 
+  init_dynamic_string(&ds_warnings, NULL, 0, 256);
   /*
     Evaluate query if this is an eval command
   */


Attachment: [text/bzr-bundle] bzr/[e-mail]