Changeset: 67fedf3a2100 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67fedf3a2100
Modified Files:
sql/server/rel_updates.c
Branch: Oct2014
Log Message:
fixed (another) crash in multi value updates
diffs (24 lines):
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
@@ -891,12 +891,15 @@ update_table(mvc *sql, dlist *qname, dli
sql->session->status = status;
if (single) {
v = rel_value_exp(sql, &r, a,
sql_sel, ek);
- } else if (!rel_val) {
- list *val_exps;
+ } else if (!rel_val && r) {
r = rel_subquery(sql, r, a, ek,
APPLY_JOIN);
- val_exps = rel_projections(sql,
r->r, NULL, 0, 1);
- r = rel_project(sql->sa, r,
rel_projections(sql, r, NULL, 1, 1));
- list_merge(r->exps, val_exps,
(fdup)NULL);
+ if (r) {
+ list *val_exps =
rel_projections(sql, r->r, NULL, 0, 1);
+
+ r =
rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1, 1));
+ if (r)
+
list_merge(r->exps, val_exps, (fdup)NULL);
+ }
}
}
if ((single && !v) || (!single && !r)) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
