Changeset: e13088976d30 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13088976d30
Modified Files:
sql/server/rel_select.c
Branch: Jul2017
Log Message:
fix crash/assert of Bug 6422 (make sure we only remove the wrapping select if
the
innner part matches).
diffs (20 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2355,13 +2355,11 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
lr = rel_select_copy(sql->sa, lr, sa_list(sql->sa));
lr = rel_logical_exp(sql, lr, lo, f);
- if (lr) {
+ rr = rel_select_copy(sql->sa, rr, sa_list(sql->sa));
+ rr = rel_logical_exp(sql, rr, ro, f);
+ if (lr && rr && lr->l == rr->l) {
lexps = lr->exps;
lr = lr->l;
- }
- rr = rel_select_copy(sql->sa, rr, sa_list(sql->sa));
- rr = rel_logical_exp(sql, rr, ro, f);
- if (rr) {
rexps = rr->exps;
rr = rr->l;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
