MonetDB: default - merge with default

[Martin Kersten]

Changeset: 0c6fd304ff97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c6fd304ff97
Modified Files:
        monetdb5/modules/kernel/aggr.c
Branch: default
Log Message:

merge with default


diffs (39 lines):

diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -1058,7 +1058,7 @@ AGGRsubmin_val(bat *retval, bat *bid, ba
 {
        BAT *a, *b, *r;
        str res;
-       int ret;
+       bat ret;
 
        if ((res = AGGRsubgrouped(&ret, NULL, bid, gid, eid, NULL, *skip_nils,
                                                  0, TYPE_oid, BATgroupmin, 
NULL, "aggr.submin")) != MAL_SUCCEED)
@@ -1079,7 +1079,7 @@ AGGRsubmincand_val(bat *retval, bat *bid
 {
        BAT *a, *b, *r;
        str res;
-       int ret;
+       bat ret;
 
        if ((res = AGGRsubgrouped(&ret, NULL, bid, gid, eid, sid, *skip_nils,
                                                  0, TYPE_oid, BATgroupmin, 
NULL, "aggr.submin")) != MAL_SUCCEED)
@@ -1100,7 +1100,7 @@ AGGRsubmax_val(bat *retval, bat *bid, ba
 {
        BAT *a, *b, *r;
        str res;
-       int ret;
+       bat ret;
 
        if ((res = AGGRsubgrouped(&ret, NULL, bid, gid, eid, NULL, *skip_nils,
                                                  0, TYPE_oid, BATgroupmax, 
NULL, "aggr.submax")) != MAL_SUCCEED)
@@ -1121,7 +1121,7 @@ AGGRsubmaxcand_val(bat *retval, bat *bid
 {
        BAT *a, *b, *r;
        str res;
-       int ret;
+       bat ret;
 
        if ((res = AGGRsubgrouped(&ret, NULL, bid, gid, eid, sid, *skip_nils,
                                                  0, TYPE_oid, BATgroupmax, 
NULL, "aggr.submax")) != MAL_SUCCEED)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list