Changeset: 6d6c9440ee0f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d6c9440ee0f
Modified Files:
monetdb5/modules/atoms/json.c
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (12 lines):
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -2175,7 +2175,7 @@ JSONjsonaggr(BAT **bnp, BAT *b, BAT *g,
freeg = 1;
if (t2->ttype == TYPE_void) {
map = NULL;
- mapoff = b->tseqbase;
+ mapoff = t2->tseqbase;
} else {
map = (const oid *) Tloc(t2, 0);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
