Changeset: 0d0b43892e84 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0d0b43892e84 Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message:
Merge with Sep2022 branch. diffs (103 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -774,3 +774,4 @@ 38ba6e40ba9148c762fe4a4b40f4937f86e516b6 470e524a786ee0e94c7901ec98d95ac351a0e472 Sep2022_root 9785fa2a471fe32495e07479edf110335ddaa750 Jan2022_17 26ffeb5af5240c807a6583fd6eb4ee2c9cd210d2 Jan2022_19 +3191fee438036ac0da1e6f31481b9681399123b5 Jan2022_21 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -849,6 +849,9 @@ fi %endif %changelog +* Fri Aug 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.21-20220819 +- Rebuilt. + * Mon Aug 15 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.19-20220815 - Rebuilt. diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -70,5 +70,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ # version of the SQL library (subdirectory sql) set(SQL_VERSION_MAJOR "12") set(SQL_VERSION_MINOR "0") -set(SQL_VERSION_PATCH "7") +set(SQL_VERSION_PATCH "8") set(SQL_VERSION "${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.43.21) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 19 Aug 2022 11:09:51 +0200 + monetdb (11.43.19) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c --- a/gdk/gdk_select.c +++ b/gdk/gdk_select.c @@ -50,13 +50,14 @@ virtualize(BAT *bn) * (const oid *) Tloc(bn, 0) + BATcount(bn) - 1 == * (const oid *) Tloc(bn, BATcount(bn) - 1))) { /* column is dense, replace by virtual oid */ - TRC_DEBUG(ALGO, ALGOBATFMT ",seq=" OIDFMT "\n", - ALGOBATPAR(bn), - BATcount(bn) > 0 ? * (const oid *) Tloc(bn, 0) : 0); + oid tseq; /* work around bug in Intel compiler */ if (BATcount(bn) == 0) - bn->tseqbase = 0; + tseq = 0; else - bn->tseqbase = * (const oid *) Tloc(bn, 0); + tseq = * (const oid *) Tloc(bn, 0); + TRC_DEBUG(ALGO, ALGOBATFMT ",seq=" OIDFMT "\n", + ALGOBATPAR(bn), tseq); + bn->tseqbase = tseq; if (VIEWtparent(bn)) { Heap *h = GDKmalloc(sizeof(Heap)); bat bid = VIEWtparent(bn); diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,9 @@ +monetdb (11.43.21) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 19 Aug 2022 11:09:51 +0200 + monetdb (11.43.19) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,6 @@ +* Fri Aug 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.21-20220819 +- Rebuilt. + * Mon Aug 15 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.19-20220815 - Rebuilt. diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022 --- a/sql/ChangeLog.Sep2022 +++ b/sql/ChangeLog.Sep2022 @@ -1,6 +1,9 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Aug 19 2022 svetlin <svetlin.stali...@monetdbsolutions.com> +- Added default role to create user statement + * Mon Aug 15 2022 Sjoerd Mullender <sjo...@acm.org> - A new function sys.url_extract_host(string, bool) which returns the host name from the given URL has been implemented. The bool argument, _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org