MonetDB: default - Merge with Dec2016 branch.

[Sjoerd Mullender]

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

Merge with Dec2016 branch.


diffs (38 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -395,7 +395,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
        size_t i, n;
        size_t savefree;
        const char *filename;
-       bat bid;
+       bat bid = b->batCacheid;
 
        assert(b->theap.parentid == 0);
        assert(width != 0);
@@ -430,7 +430,6 @@ GDKupgradevarheap(BAT *b, var_t v, int c
                filename = b->theap.filename;
        else
                filename++;
-       bid = strtol(filename, NULL, 8);
        if ((BBP_status(bid) & (BBPEXISTING|BBPDELETED)) &&
            !file_exists(b->theap.farmid, BAKDIR, filename, NULL) &&
            (b->theap.storage != STORE_MEM ||
@@ -505,7 +504,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
                break;
        case 4:
 #ifndef NDEBUG
-               memset(ps, 0, b->theap.base + b->theap.size - (char *) pi);
+               memset(pi, 0, b->theap.base + b->theap.size - (char *) pi);
 #endif
                switch (b->twidth) {
                case 1:
@@ -521,7 +520,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
 #if SIZEOF_VAR_T == 8
        case 8:
 #ifndef NDEBUG
-               memset(ps, 0, b->theap.base + b->theap.size - (char *) pv);
+               memset(pv, 0, b->theap.base + b->theap.size - (char *) pv);
 #endif
                switch (b->twidth) {
                case 1:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list