MonetDB: Dec2016 - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: ce667e504110 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce667e504110
Modified Files:
        gdk/gdk_batop.c
Branch: Dec2016
Log Message:

Merge with Jun2016 branch.


diffs (21 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -420,7 +420,7 @@ BATappend(BAT *b, BAT *n, bit force)
        OIDXdestroy(b);
 
        /* append two void,void bats */
-       if (b->ttype == TYPE_void && BATtdense(b)) {
+       if (b->ttype == TYPE_void && BATtdense(n)) {
                oid f = n->tseqbase;
 
                if (n->ttype != TYPE_void)
@@ -428,7 +428,7 @@ BATappend(BAT *b, BAT *n, bit force)
 
                if (BATcount(b) == 0 && f != oid_nil)
                        BATtseqbase(b, f);
-               if (BATtdense(n) && BATcount(b) + b->tseqbase == f) {
+               if (BATcount(b) + b->tseqbase == f) {
                        sz += BATcount(b);
                        BATsetcount(b, sz);
                        if (b->tunique)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list