Changeset: 9c313085d85a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c313085d85a Modified Files: gdk/gdk_join.c Branch: Jul2017 Log Message:
Merge with Dec2016 branch. diffs (13 lines): diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c --- a/gdk/gdk_join.c +++ b/gdk/gdk_join.c @@ -594,8 +594,7 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l, lcand += i; cnt -= i; o = l->hseqbase + BATcount(l); - i = binsearch_oid(NULL, 0, lcand, 0, cnt - 1, o, 1, 0); - cnt -= i; + cnt = binsearch_oid(NULL, 0, lcand, 0, cnt - 1, o, 1, 0); if (BATextend(r1, cnt) != GDK_SUCCEED) goto bailout; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list