Changeset: 23a797ab1392 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23a797ab1392
Modified Files:
sql/server/rel_optimizer.c
sql/server/rel_updates.c
Branch: Feb2013
Log Message:
fixed strdup issue, ie bug 3360
diffs (24 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -3874,7 +3874,7 @@ rel_reduce_groupby_exps(int *changes, mv
}
}
if (cnr && nr &&
list_length(tbls[j]->pkey->k.columns) == nr) {
- char rname[16], *rnme =
number2name(rname, 16, ++sql->label);
+ char rname[16], *rnme =
sa_strdup(sql->sa, number2name(rname, 16, ++sql->label));
sql_rel *r = rel_basetable(sql,
tbls[j], rnme);
list *ngbe = new_exp_list(sql->sa);
list *exps = rel->exps, *nexps =
new_exp_list(sql->sa);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -612,7 +612,7 @@ rel_update_join_idx(mvc *sql, sql_idx *i
int need_nulls = 0;
node *m, *o;
sql_key *rk = &((sql_fkey *) i->key)->rkey->k;
- sql_rel *rt = rel_basetable(sql, rk->t, nme);
+ sql_rel *rt = rel_basetable(sql, rk->t, sa_strdup(sql->sa, nme));
sql_subtype *bt = sql_bind_localtype("bit");
sql_subfunc *or = sql_bind_func_result(sql->sa, sql->session->schema,
"or", bt, bt, bt);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
