MonetDB: sq2 - and make it compile.

[Niels Nes]

Changeset: 3ad85df70bfb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ad85df70bfb
Modified Files:
        sql/server/rel_select.c
Branch: sq2
Log Message:

and make it compile.


diffs (35 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
@@ -3807,7 +3807,6 @@ rel_binop(sql_query *query, sql_rel **re
        mvc *sql = query->sql;
        dnode *dl = se->data.lval->h;
        sql_exp *l, *r;
-       sql_rel *orel = *rel, *left;
        char *fname = qname_fname(dl->data.lval);
        char *sname = qname_schema(dl->data.lval);
        sql_schema *s = sql->session->schema;
@@ -3822,7 +3821,6 @@ rel_binop(sql_query *query, sql_rel **re
                return NULL;
 
        l = rel_value_exp(query, rel, dl->next->data.sym, f, iek);
-       left = *rel;
        r = rel_value_exp(query, rel, dl->next->next->data.sym, f, iek);
        if (l && *rel && exp_card(l) > CARD_AGGR && rel_find_groupby(*rel)) {
                if (l && exp_relname(l) && exp_name(l))
@@ -3831,7 +3829,6 @@ rel_binop(sql_query *query, sql_rel **re
        }
 
        if (!l || !r) {
-               *rel = orel;
                sf = find_func(sql, s, fname, 2, F_AGGR, NULL);
        }
        if (!sf && (!l || !r) && *rel && (*rel)->card == CARD_AGGR) {
@@ -5506,7 +5503,6 @@ rel_value_exp2(sql_query *query, sql_rel
 
                                                if (e->l && e->r)
                                                        ne = 
rel_bind_column2(sql, r, e->l, e->r, 0);
-                                               }
                                                if (ne) {
                                                        e = ne;
                                                        r = r->l;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list