Changeset: b83371ba847e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b83371ba847e
Modified Files:
sql/server/rel_select.c
Branch: SciQL-2
Log Message:
_rel_aggr(): fixed left-over merge conflict in commented-out code
diffs (17 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
@@ -4537,12 +4537,8 @@ static sql_exp *
sql_rel *j = i->r;
sql_exp *e = j->exps->h->data;
-<<<<<<<
/net/rome.ins.cwi.nl/export/scratch2/manegold/.rig./scratch0/Monet/HG/__ANY__/source/MonetDB/sql/server/rel_select.c
+ assert(0);
e = exp_column(sql->sa, exp_relname(e),
exp_name(e), exp_subtype(e), exp_card(e), has_nil(e), 0, e->type ==
e_column?e->f:NULL);
-=======
- assert(0);
- e = exp_column(sql->sa, exp_relname(e),
exp_name(e), exp_subtype(e), exp_card(e), has_nil(e), 0);
->>>>>>> /tmp/rel_select.c~other.Nlx73Y
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
