MonetDB: Nov2019 - we need to and the PSM flags

[Niels Nes]

Changeset: 257bc073dc33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=257bc073dc33
Modified Files:
        sql/server/rel_exp.c
        sql/server/rel_rel.c
Branch: Nov2019
Log Message:

we need to and the PSM flags


diffs (24 lines):

diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -2008,7 +2008,7 @@ exp_copy( sql_allocator *sa, sql_exp * e
                        ne = exp_param(sa, e->r, &e->tpe, e->flag);
                break;
        case e_psm:
-               if (e->flag == PSM_SET) 
+               if (e->flag & PSM_SET) 
                        ne = exp_set(sa, e->alias.name, exp_copy(sa, e->l), 
GET_PSM_LEVEL(e->flag));
                break;
        }
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1518,7 +1518,7 @@ exp_deps(mvc *sql, sql_exp *e, list *ref
                        if (exp_deps(sql, e->l, refs, l) != 0 ||
                            exps_deps(sql, e->r, refs, l) != 0)
                                return -1;
-                       if (e->flag == PSM_IF && e->f)
+                       if (e->flag & PSM_IF && e->f)
                            return exps_deps(sql, e->r, refs, l);
                } else if (e->flag & PSM_REL) {
                        sql_rel *rel = e->l;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list