Changeset: 7c96c11050fc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7c96c11050fc Modified Files: MonetDB.spec gdk/gdk_join.c Branch: Jul2021 Log Message:
Merge with Oct2020 branch. diffs (55 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -829,7 +829,6 @@ fi %changelog * Mon May 03 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503 - Rebuilt. -- GH#2430: JDBC: support for streams - GH#3336: DB files not removed if all rows are deleted, even after restart - GH#7104: Monetdbe NTILE function does not produce correct ordering - GH#7108: Monetdb crashes on query execution diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ monetdb (11.39.17) unstable; urgency=low * Rebuilt. - * GH#2430: JDBC: support for streams * GH#3336: DB files not removed if all rows are deleted, even after restart * GH#7104: Monetdbe NTILE function does not produce correct ordering * GH#7108: Monetdb crashes on query execution diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c --- a/gdk/gdk_join.c +++ b/gdk/gdk_join.c @@ -1797,7 +1797,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l, lordering = l->tsorted && (r->tsorted || !equal_order) ? 1 : -1; rordering = equal_order ? lordering : -lordering; if (!l->tnonil && !nil_matches && !nil_on_miss) { - nl = binsearch(NULL, 0, l->ttype, lvals, lvars, lwidth, 0, BATcount(l), nil, lordering, 1); + nl = binsearch(NULL, 0, l->ttype, lvals, lvars, lwidth, 0, BATcount(l), nil, l->tsorted ? 1 : -1, 1); nl = canditer_search(lci, nl + l->hseqbase, true); if (l->tsorted) { canditer_setidx(lci, nl); diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,7 +1,6 @@ monetdb (11.39.17) unstable; urgency=low * Rebuilt. - * GH#2430: JDBC: support for streams * GH#3336: DB files not removed if all rows are deleted, even after restart * GH#7104: Monetdbe NTILE function does not produce correct ordering * GH#7108: Monetdb crashes on query execution diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,6 +1,5 @@ * Mon May 03 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503 - Rebuilt. -- GH#2430: JDBC: support for streams - GH#3336: DB files not removed if all rows are deleted, even after restart - GH#7104: Monetdbe NTILE function does not produce correct ordering - GH#7108: Monetdb crashes on query execution _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
