MonetDB: Jul2021 - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: 793071efc3a9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/793071efc3a9
Modified Files:
        gdk/gdk_project.c
Branch: Jul2021
Log Message:

Merge with Oct2020 branch.


diffs (12 lines):

diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -374,7 +374,7 @@ project_str(BAT *restrict l, struct cand
        v = (var_t) r1->tvheap->free;
        if (r1->tvheap == r2->tvheap) {
                h1off = 0;
-               BBPshare(bn->tvheap->parentid);
+               BBPshare(r1->tvheap->parentid);
                HEAPfree(bn->tvheap, true);
                GDKfree(bn->tvheap);
                bn->tvheap = r1->tvheap;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list