Changeset: 016e0314d5ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=016e0314d5ab
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (23 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
@@ -2506,11 +2506,17 @@ rel_logical_exp(sql_query *query, sql_re
lr = rel_select_copy(sql->sa, lr, sa_list(sql->sa));
lr = rel_logical_exp(query, lr, lo, f);
- if (!lr)
+ if (!lr) {
+ sql->pushdown = pushdown;
return NULL;
+ }
rr = rel_select_copy(sql->sa, rr, sa_list(sql->sa));
rr = rel_logical_exp(query, rr, ro, f);
- if (lr && rr && lr->l == rr->l) {
+ if (!rr) {
+ sql->pushdown = pushdown;
+ return NULL;
+ }
+ if (lr->l == rr->l) {
lexps = lr->exps;
lr = lr->l;
rexps = rr->exps;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
