From: Bjorn Munch
Date: December 6 2010 1:34pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3123) Bug#58710
List-Archive: http://lists.mysql.com/commits/126134
X-Bug: 58710
Message-Id: <201012061334.oB6DYl13022807@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1904132400=="

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

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

 3123 Bjorn Munch	2010-12-06
      Bug #58710 Valgrind warnings in mysqltest
      Var's string value was not 0-terminated if intially null.
      While at it, also removed some reported memory leaks

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-26 09:57:01 +0000
+++ b/client/mysqltest.cc	2010-12-06 13:32:27 +0000
@@ -2093,10 +2093,9 @@ VAR *var_init(VAR *v, const char *name,
     die("Out of memory");
 
   if (val)
-  {
     memcpy(tmp_var->str_val, val, val_len);
-    tmp_var->str_val[val_len]= 0;
-  }
+  tmp_var->str_val[val_len]= 0;
+
   var_check_int(tmp_var);
   tmp_var->name_len = name_len;
   tmp_var->str_val_len = val_len;
@@ -5053,6 +5052,7 @@ void do_close_connection(struct st_comma
     dynstr_append_mem(ds, ";\n", 2);
   }
 
+  dynstr_free(&ds_connection);
   DBUG_VOID_RETURN;
 }
 
@@ -5481,6 +5481,7 @@ void do_connect(struct st_command *comma
   dynstr_free(&ds_port);
   dynstr_free(&ds_sock);
   dynstr_free(&ds_options);
+  dynstr_free(&ds_default_auth);
 #ifdef HAVE_SMEM
   dynstr_free(&ds_shm);
 #endif
@@ -5729,6 +5730,7 @@ void do_block(enum block_cmd cmd, struct
     }
 
     v.is_int= TRUE;
+    var_free(&v2);
   } else
   {
     if (*expr_start != '`' && ! my_isdigit(charset_info, *expr_start))
@@ -7822,7 +7824,7 @@ void run_query(struct st_connection *cn,
 		     ds, &ds_warnings);
 
   dynstr_free(&ds_warnings);
-  if (command->type == Q_EVAL)
+  if (command->type == Q_EVAL || command->type == Q_SEND_EVAL)
     dynstr_free(&eval_query);
 
   if (display_result_sorted)


--===============1904132400==
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/valgmt-55/
# testament_sha1: 1e3fe7ee3bf46e8046662f25f6f9d7104f6b2294
# timestamp: 2010-12-06 14:34:47 +0100
# base_revision_id: bjorn.munch@stripped\
#   kjq5ca8bizxx5opr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdKNN9IAAcFfgEAQWef//3YH
KYq////0UAQquexS4Ntpdt1gkkQ1MKejSbKn6NFPTEnontFMEaMh6nqM1BKIAjQNJommp4miDJoA
GgNA0HMJgEwAmEwmmAAATJpoGEkSZU/UamjJpppkDaI0aMgGJoANMJRTEymyFPRqek0eiDQAPUaA
AAHW5LiN6n9PD0K7bAcw0juNcykZBxhnpbNLI0Ub4Yk5Hxvjn7/EoqiYZdPcJR0JYKrHsZgvJeXL
OwcRWat7u4vpI9UXOwd6+7/Uutsjiotki5P0zuISOJroo+/J0Z6MdP5yJzIp1plRGlNsdnRped4g
wsqkW7wIpUnWufeyMkyRCxItNODwSJjDUk059iqhCuw5EQ6RVgTlkwERSGU2VSkqYiuDQ4Ct2yFE
YKa8LHJGAzApOWkNLgextLRJBCbOtrpIHunYfNDZ6New487SiNFZYwynWUT+bE9oI4R4maREt8Ce
JAy5nRmHgOoJtg+0nm0NCLMNzS/EvuVKwLmiczrECcDS7Hn3XkIja3hYjtsmlZZ4WH+MytsSaoLr
NRhhDYSySY683YmNJBw4I1GWolFXmqWhNJXrAwSYgroVNrVKRLaRrSWXDdPPNLEdr0uGqiULqPcr
CVZajXR6Myw3lKOuxMB7EXN+BxKSuomNekSdl7DRguisUtWi6FDtdV8cpiONiFlLYq2Ew+ZFnVpA
J3qrcEuwPvmMmaXDaxSBr892tbkjkYKWTH62nGLl7HEpgw9w7AdVX95NX5nco39CIR1REni8O3X2
rfqkgkTw2k8QRb1l8DI+rF1owaB2+WBSjxJJmmbDm4bCs6bO1ag2HWM7+WidT1IJvIwnZPwKd5lo
70Sy1c6KULTKzJF+BI++bpy0/gYJlkVVeyMx+BYVSp8E5z1Gp6tJ9Yxfwb1xkZea8uJPBdlc/N+y
m+yeR52W2h6GZCcdcWL2dpgm/na1erx55lpjxWv5Yara8W5tLEUJXZNzxmvhiYCxMQMRno4XKXFW
GawGmQ5FH2kxuu1Zhjb8k2yJj4osezYq2QsoQ9+uhKQyZXNLupSgjERX4HA39WxHjzfbALmUf2a6
wnmHILpUxH4/VMVvc9Ixq/KV12BQtt3fTmDRUD3hGRE6Qx0zTkZhFI6r4M4bOE72vSLCVOinvupJ
IQWEwXQL+CRPYeyJSisLRqIKxbVi9uL1RBrBQ5Qba4gtk4T7CBfE20yZlQ6oN3lvVrqQ7KSOx6DM
v5ImE1dBZh9rGSp50JsNrMnGIjqlspiUHCoW4Ta4UBaplhHNYiJwgZIuMEFu4MJ8d1raFEYoJN0L
HPVC6Uf7uJ2QpvUleCzo/br0alzBgSEiF51QZTXbjGPzq5FEbUz8Dld0V1RCgvGFLJXHKU6BBFBY
Kl+Bpd16jhHhj4VpHQ/WeVpn52Vv520qAdhIMtFxaaFfBSK4y7HE5cZjSWh5m81ELrqjDwIVES9r
P+LuSKcKEhpRpvpA


--===============1904132400==--