MonetDB: Apr2019 - Repair incorrect merge.

[Sjoerd Mullender]

Changeset: 9b374b041e39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b374b041e39
Modified Files:
        gdk/gdk_bbp.c
Branch: Apr2019
Log Message:

Repair incorrect merge.


diffs (16 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2098,11 +2098,7 @@ incref(bat i, bool logical, bool lock)
                 * to the correct values */
                assert(!logical);
                if (tp) {
-                       BAT *pb;
-                       incref(tp, false, lock);
-                       pb = getBBPdescriptor(tp, lock);
-                       if (!pb) 
-                               return 0;
+                       assert(pb != NULL);
                        b->theap.base = pb->theap.base + (size_t) b->theap.base;
                }
                /* done loading, release descriptor */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list