Changeset: 5cfe0fd0fb01 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cfe0fd0fb01 Modified Files: sql/server/rel_select.c Branch: sciql Log Message:
Fix compilation after merge diffs (12 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 @@ -4257,7 +4257,7 @@ _rel_aggr(mvc *sql, sql_rel **rel, int d if (groupby->r && ((list*)groupby->r)->h && ((sql_exp*)((list*)groupby->r)->h->data)->type == e_column && ((sql_exp*)((list*)groupby->r)->h->data)->f) { /* e_column->f has been "misused" => an aggragation over array tiles */ - return _rel_tiling_aggr(sql, rel, groupby, distinct, aggrstr, sym, f); + return _rel_tiling_aggr(sql, rel, groupby, distinct, aggrstr, args->data.sym, f); } if (!args->data.sym) { /* count(*) case */ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list