Changeset: f18068ba451c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f18068ba451c Modified Files: MonetDB.spec cmake/monetdb-versions.cmake Branch: default Log Message:
Merge with Jan2022 branch. diffs (175 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -832,3 +832,4 @@ 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release 9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release 9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release +97e76b882f9fb28327393d21708fb22f2f6c22f1 Jan2022_7 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -81,7 +81,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Jan2022/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jan2022-SP1/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -850,6 +850,20 @@ fi %endif %changelog +* Thu Feb 03 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.7-20220203 +- Rebuilt. +- GH#7228: COMMIT: transaction is aborted because of concurrency + conflicts, will ROLLBACK instead +- GH#7230: Prepared statement of INSERT with SELECT fails when types difer +- GH#7232: False conflicts when inserting in a not null field + +* Mon Jan 24 2022 svetlin <svetlin.stali...@monetdbsolutions.com> - 11.43.7-20220203 +- sql: [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] + Added SQL procedures sys.vacuum(sname string, tname string, cname string), + sys.vacuum(sname string, tname string, cname string, interval int), + sys.stop_vacuum(sname string, tname string, cname string). + These can be used to vacuum string columns. + * Tue Jan 18 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 - Rebuilt. diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -40,7 +40,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_MAJOR "25") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "0") +set(GDK_VERSION_PATCH "1") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) @@ -52,7 +52,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_MAJOR "32") set(MONETDB5_VERSION_MINOR "0") -set(MONETDB5_VERSION_PATCH "2") +set(MONETDB5_VERSION_PATCH "3") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}") # version of the MONETDBE library (subdirectory tools/monetdbe) @@ -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 "0") +set(SQL_VERSION_PATCH "1") 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,23 @@ +monetdb (11.43.7) unstable; urgency=low + + * Rebuilt. + * GH#7228: COMMIT: transaction is aborted because of concurrency + conflicts, will ROLLBACK instead + * GH#7230: Prepared statement of INSERT with SELECT fails when types difer + * GH#7232: False conflicts when inserting in a not null field + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 03 Feb 2022 09:58:19 +0100 + +monetdb (11.43.7) unstable; urgency=low + + * sql: [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] + Added SQL procedures sys.vacuum(sname string, tname string, cname string), + sys.vacuum(sname string, tname string, cname string, interval int), + sys.stop_vacuum(sname string, tname string, cname string). + These can be used to vacuum string columns. + + -- svetlin <svetlin.stali...@monetdbsolutions.com> Mon, 24 Jan 2022 09:58:19 +0100 + monetdb (11.43.5) unstable; urgency=low * Rebuilt. 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,23 @@ +monetdb (11.43.7) unstable; urgency=low + + * Rebuilt. + * GH#7228: COMMIT: transaction is aborted because of concurrency + conflicts, will ROLLBACK instead + * GH#7230: Prepared statement of INSERT with SELECT fails when types difer + * GH#7232: False conflicts when inserting in a not null field + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 03 Feb 2022 09:58:19 +0100 + +monetdb (11.43.7) unstable; urgency=low + + * sql: [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] + Added SQL procedures sys.vacuum(sname string, tname string, cname string), + sys.vacuum(sname string, tname string, cname string, interval int), + sys.stop_vacuum(sname string, tname string, cname string). + These can be used to vacuum string columns. + + -- svetlin <svetlin.stali...@monetdbsolutions.com> Mon, 24 Jan 2022 09:58:19 +0100 + monetdb (11.43.5) 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,17 @@ +* Thu Feb 03 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.7-20220203 +- Rebuilt. +- GH#7228: COMMIT: transaction is aborted because of concurrency + conflicts, will ROLLBACK instead +- GH#7230: Prepared statement of INSERT with SELECT fails when types difer +- GH#7232: False conflicts when inserting in a not null field + +* Mon Jan 24 2022 svetlin <svetlin.stali...@monetdbsolutions.com> - 11.43.7-20220203 +- sql: [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] + Added SQL procedures sys.vacuum(sname string, tname string, cname string), + sys.vacuum(sname string, tname string, cname string, interval int), + sys.stop_vacuum(sname string, tname string, cname string). + These can be used to vacuum string columns. + * Tue Jan 18 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 - Rebuilt. diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive +++ b/sql/ChangeLog-Archive @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Jan 24 2022 svetlin <svetlin.stali...@monetdbsolutions.com> - 11.43.7-20220203 +- [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] + Added SQL procedures sys.vacuum(sname string, tname string, cname string), + sys.vacuum(sname string, tname string, cname string, interval int), + sys.stop_vacuum(sname string, tname string, cname string). + These can be used to vacuum string columns. + * Wed Jan 12 2022 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.43.5-20220118 - Add string imprints to the existing imprints index creation syntax. On string column "col" of a table "tbl" marked read only ("ALTER TABLE tbl diff --git a/sql/ChangeLog.Jan2022 b/sql/ChangeLog.Jan2022 --- a/sql/ChangeLog.Jan2022 +++ b/sql/ChangeLog.Jan2022 @@ -1,10 +1,3 @@ # ChangeLog file for sql # This file is updated with Maddlog -* Mon Jan 24 2022 svetlin <svetlin.stali...@monetdbsolutions.com> -- [This feature was already released in Jan2022 (11.43), but the ChangeLog was missing] - Added SQL procedures sys.vacuum(sname string, tname string, cname string), - sys.vacuum(sname string, tname string, cname string, interval int), - sys.stop_vacuum(sname string, tname string, cname string). - These can be used to vacuum string columns. - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
