MonetDB: Jul2017 - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: 27fc6ce96f46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27fc6ce96f46
Modified Files:
        gdk/gdk_bat.c
Branch: Jul2017
Log Message:

Merge with Dec2016 branch.


diffs (19 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -136,6 +136,7 @@ BATcreatedesc(oid hseq, int tt, int heap
        bn->batDirty = TRUE;
        return bn;
       bailout:
+       BBPclear(bn->batCacheid);
        if (tt)
                HEAPfree(&bn->theap, 1);
        if (bn->tvheap) {
@@ -213,6 +214,7 @@ BATnewstorage(oid hseq, int tt, BUN cap,
        }
        return bn;
   bailout:
+       BBPclear(bn->batCacheid);
        HEAPfree(&bn->theap, 1);
        GDKfree(bn);
        return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list