MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

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

Merge with Jul2021 branch.


diffs (20 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -785,3 +785,4 @@ 700e099bfee85318da09aabcd78ec7ea6e8fb6ef
 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
 24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -80,7 +80,7 @@ epilogue(int cnt, bat *subcommit, bool l
                        }
                }
                b = BBP_desc(bid);
-               if (b && ATOMvarsized(b->ttype)) {
+               if (b && b->ttype >= 0 && ATOMvarsized(b->ttype)) {
                        MT_lock_set(&b->theaplock);
                        ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
                        if (p != NULL) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org