bk commit into 5.1 tree (cmiller:1.2337)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-28 09:51:46-04:00, cmiller@stripped +1 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
  MERGE: 1.1810.1697.165

  client/mysqltest.c@stripped, 2006-09-28 09:51:42-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.155.9.52

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug21476/my51-bug21476/RESYNC

--- 1.227/client/mysqltest.c	2006-09-28 09:51:51 -04:00
+++ 1.228/client/mysqltest.c	2006-09-28 09:51:51 -04:00
@@ -1784,6 +1784,7 @@ int do_save_master_pos()
 
 int do_let(struct st_query *query)
 {
+  int ret;
   char *p= query->first_argument;
   char *var_name, *var_name_end;
   DYNAMIC_STRING let_rhs_expr;
@@ -1813,8 +1814,11 @@ int do_let(struct st_query *query)
 
   query->last_argument= query->end;
   /* Assign var_val to var_name */
-  return var_set(var_name, var_name_end, let_rhs_expr.str, 
+  ret= var_set(var_name, var_name_end, let_rhs_expr.str, 
                  (let_rhs_expr.str + let_rhs_expr.length));
+  dynstr_free(&let_rhs_expr);
+
+  return(ret);
 }