Commit ce24cb2d authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
parents 6042eebd 75a1d1d5
...@@ -1784,6 +1784,7 @@ int do_save_master_pos() ...@@ -1784,6 +1784,7 @@ int do_save_master_pos()
int do_let(struct st_query *query) int do_let(struct st_query *query)
{ {
int ret;
char *p= query->first_argument; char *p= query->first_argument;
char *var_name, *var_name_end; char *var_name, *var_name_end;
DYNAMIC_STRING let_rhs_expr; DYNAMIC_STRING let_rhs_expr;
...@@ -1813,8 +1814,11 @@ int do_let(struct st_query *query) ...@@ -1813,8 +1814,11 @@ int do_let(struct st_query *query)
query->last_argument= query->end; query->last_argument= query->end;
/* Assign var_val to var_name */ /* 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)); (let_rhs_expr.str + let_rhs_expr.length));
dynstr_free(&let_rhs_expr);
return(ret);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment