Changeset: 62194816af09 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62194816af09
Modified Files:
sql/server/rel_psm.c
Branch: Jul2017
Log Message:
fix for bug 6381
diffs (21 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -241,8 +241,16 @@ rel_psm_while_do( mvc *sql, sql_subtype
n = n->next;
whilestmts = sequential_block(sql, res, restypelist,
n->data.lval, n->next->data.sval, is_func);
- if (sql->session->status || !cond || !whilestmts || rel)
+ if (sql->session->status || !cond || !whilestmts)
return NULL;
+ if (rel) {
+ sql_exp *er = exp_rel(sql, rel);
+ list *b = sa_list(sql->sa);
+
+ append(b, er);
+ append(b, exp_while( sql->sa, cond, whilestmts ));
+ return exp_rel(sql, rel_psm_block(sql->sa, b));
+ }
return exp_while( sql->sa, cond, whilestmts );
}
return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
