MonetDB: Dec2016 - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: 99aabb9cfcc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99aabb9cfcc6
Modified Files:
        monetdb5/modules/atoms/json.c
Branch: Dec2016
Log Message:

Merge with Jun2016 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