Changeset: e72f584a16b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e72f584a16b3
Modified Files:
sql/server/rel_optimizer.c
Branch: Nov2019
Log Message:
Backported changeset 93e6f1786a8b into Nov2019
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
@@ -7454,7 +7454,7 @@ rel_simplify_predicates(int *changes, mv
if ((is_select(rel->op) || is_join(rel->op) || is_semi(rel->op)) &&
rel->exps) {
node *n;
list *exps = sa_list(sql->sa);
-
+
for (n = rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
@@ -7482,9 +7482,9 @@ rel_simplify_predicates(int *changes, mv
if (l->type == e_func) {
sql_subfunc *f = l->f;
-
+
/* rewrite isnull(x) = TRUE/FALSE => x
=/<> NULL */
- if (!f->func->s &&
!strcmp(f->func->base.name, "isnull") &&
+ if (is_select(rel->op) && !f->func->s
&& !strcmp(f->func->base.name, "isnull") &&
is_atom(r->type) && r->l) { /*
direct literal */
atom *a = r->l;
int flag = a->data.val.bval;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
