MonetDB: default - Merge with Sep2022 branch.

[Sjoerd Mullender]

Changeset: 1892f94275f6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1892f94275f6
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: default
Log Message:

Merge with Sep2022 branch.


diffs (18 lines):

diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -134,10 +134,12 @@ TABLETcreate_bats(Tablet *as, BUN est)
                fmt[i].c = void_bat_create(fmt[i].adt, est);
                if (!fmt[i].c) {
                        while (i > 0) {
-                               if (!fmt[--i].skip)
+                               if (!fmt[--i].skip) {
                                        BBPreclaim(fmt[i].c);
+                                       fmt[i].c = NULL;
+                               }
                        }
-                       throw(SQL, "copy", "Failed to create bat of size " 
BUNFMT "\n", as->nr);
+                       throw(SQL, "copy", "Failed to create bat of size " 
BUNFMT "\n", est);
                }
                fmt[i].ci = bat_iterator_nolock(fmt[i].c);
                nr++;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org