MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: ad00adc1c3dd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ad00adc1c3dd
Modified Files:
        gdk/gdk_bat.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (14 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -861,8 +861,8 @@ COLcopy(BAT *b, int tt, bool writable, r
                        if (bn->tvheap && HEAPextend(bn->tvheap, bi.vhfree, 
true) != GDK_SUCCEED) {
                                goto bunins_failed;
                        }
-                       memcpy(bn->theap->base, bi.base, bi.count << bi.shift);
-                       bn->theap->free = bi.count << bi.shift;
+                       memcpy(bn->theap->base, bi.base, bi.hfree);
+                       bn->theap->free = bi.hfree;
                        bn->theap->dirty = true;
                        if (bn->tvheap) {
                                memcpy(bn->tvheap->base, bi.vh->base, 
bi.vhfree);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list