MonetDB: Dec2011 - merge from Aug2011

[Niels Nes]

Changeset: 373008bf840f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=373008bf840f
Modified Files:
        sql/server/rel_select.c
Branch: Dec2011
Log Message:

merge from Aug2011


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
@@ -3602,7 +3602,7 @@ _rel_aggr(mvc *sql, sql_rel **rel, int d
                if (groupby->r && exps_intern(groupby->r)) {
                        sql_rel *i = groupby->l;
 
-                       if (i->exps) {
+                       if (i->exps && f == sql_sel) {
                                e = flatten_exps(sql, i->exps);
                                e = exp_aggr1(sql->sa, e, a, distinct, 1, 
groupby->card, 0);
                                return e;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list