Changeset: ed95fab23a90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed95fab23a90
Modified Files:
sql/server/rel_optimizer.c
Branch: default
Log Message:
merged with Jun2016
diffs (18 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
@@ -1427,12 +1427,12 @@ can_push_func(sql_exp *e, sql_rel *rel,
if (e->f){
sql_subfunc *f = e->f;
- if (math_unsafe(f))
+ if (math_unsafe(f) || f->func->type != F_FUNC)
return 0;
}
if (l) for (n = l->h; n && res; n = n->next)
res &= can_push_func(n->data, rel, &lmust);
- if (!lmust)
+ if (res && !lmust)
return 1;
(*must) |= lmust;
return res;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
