Changeset: e54da523d96a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e54da523d96a
Modified Files:
debian/monetdb5-sql.install
gdk/gdk_bbp.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (29 lines):
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -9,7 +9,8 @@ debian/tmp/usr/lib/x86_64-linux-gnu/mone
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql[!_]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_aggr_[!h]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_decimal.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_[!adh]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_rank.mal
usr/lib/x86_64-linux-gnu/monetdb5
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_[!adhr]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_sql.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2235,11 +2235,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
