Changeset: b3d87b890f92 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b3d87b890f92
Modified Files:
        MonetDB.spec
        cmake/monetdb-versions.cmake
Branch: default
Log Message:

Merge with Jan2022 branch.


diffs (283 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -767,3 +767,4 @@ 2e54857a91306cc6304825c5596f65d00595db6b
 2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
+59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_15
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-SP2/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jan2022-SP3/%{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
@@ -849,6 +849,30 @@ fi
 %endif
 
 %changelog
+* Fri May 20 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- Rebuilt.
+- GH#7036: Generate column names instead of labels
+
+* Thu May 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: All accesses to the BACKUP directory need to be protected by the
+  same lock.  The lock already existed (GDKtmLock), but wasn't used
+  consistently.  This is now fixed.  Hopefully this makes the hot snapshot
+  code more reliable.
+
+* Tue May 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: When exiting, long running instructions are aborted using the same
+  mechanism that is used for query timeouts.
+
+* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+  as far as the table content is concerned.  The schema information
+  stays global.  This fixes an issue with concurrent access and cleanup
+  of stale data.
+
+* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+  It didn't work and it was never a good idea anyway.
+
 * Fri Apr 01 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.13-20220401
 - Rebuilt.
 - GH#7278: BUG when there is more than one field/filter in the having
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -39,20 +39,20 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "25")
-set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "4")
+set(GDK_VERSION_MINOR "1")
+set(GDK_VERSION_PATCH "0")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
 set(MAPI_VERSION_MAJOR "14")
 set(MAPI_VERSION_MINOR "0")
-set(MAPI_VERSION_PATCH "1")
+set(MAPI_VERSION_PATCH "2")
 set(MAPI_VERSION 
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
 
 # 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 "5")
+set(MONETDB5_VERSION_PATCH "6")
 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 "4")
+set(SQL_VERSION_PATCH "5")
 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,42 @@
+monetdb (11.43.15) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7036: Generate column names instead of labels
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 20 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * gdk: All accesses to the BACKUP directory need to be protected by the
+    same lock.  The lock already existed (GDKtmLock), but wasn't used
+    consistently.  This is now fixed.  Hopefully this makes the hot snapshot
+    code more reliable.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 19 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * gdk: When exiting, long running instructions are aborted using the same
+    mechanism that is used for query timeouts.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 10 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+    as far as the table content is concerned.  The schema information
+    stays global.  This fixes an issue with concurrent access and cleanup
+    of stale data.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 25 Apr 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+    It didn't work and it was never a good idea anyway.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 14 Apr 2022 10:10:59 +0200
+
 monetdb (11.43.13) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,16 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu May 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- All accesses to the BACKUP directory need to be protected by the
+  same lock.  The lock already existed (GDKtmLock), but wasn't used
+  consistently.  This is now fixed.  Hopefully this makes the hot snapshot
+  code more reliable.
+
+* Tue May 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- When exiting, long running instructions are aborted using the same
+  mechanism that is used for query timeouts.
+
 * Fri Apr  1 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.13-20220401
 - Improved speed of BATappend to empty varsized bat: we now just copy
   the heaps instead of inserting individual values.
diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022
--- a/gdk/ChangeLog.Jan2022
+++ b/gdk/ChangeLog.Jan2022
@@ -1,13 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Thu May 19 2022 Sjoerd Mullender <sjo...@acm.org>
-- All accesses to the BACKUP directory need to be protected by the
-  same lock.  The lock already existed (GDKtmLock), but wasn't used
-  consistently.  This is now fixed.  Hopefully this makes the hot snapshot
-  code more reliable.
-
-* Tue May 10 2022 Sjoerd Mullender <sjo...@acm.org>
-- When exiting, long running instructions are aborted using the same
-  mechanism that is used for query timeouts.
-
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,42 @@
+monetdb (11.43.15) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7036: Generate column names instead of labels
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 20 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * gdk: All accesses to the BACKUP directory need to be protected by the
+    same lock.  The lock already existed (GDKtmLock), but wasn't used
+    consistently.  This is now fixed.  Hopefully this makes the hot snapshot
+    code more reliable.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 19 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * gdk: When exiting, long running instructions are aborted using the same
+    mechanism that is used for query timeouts.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 10 May 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+    as far as the table content is concerned.  The schema information
+    stays global.  This fixes an issue with concurrent access and cleanup
+    of stale data.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 25 Apr 2022 10:10:59 +0200
+
+monetdb (11.43.15) unstable; urgency=low
+
+  * sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+    It didn't work and it was never a good idea anyway.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 14 Apr 2022 10:10:59 +0200
+
 monetdb (11.43.13) 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,27 @@
+* Fri May 20 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- Rebuilt.
+- GH#7036: Generate column names instead of labels
+
+* Thu May 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: All accesses to the BACKUP directory need to be protected by the
+  same lock.  The lock already existed (GDKtmLock), but wasn't used
+  consistently.  This is now fixed.  Hopefully this makes the hot snapshot
+  code more reliable.
+
+* Tue May 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: When exiting, long running instructions are aborted using the same
+  mechanism that is used for query timeouts.
+
+* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+  as far as the table content is concerned.  The schema information
+  stays global.  This fixes an issue with concurrent access and cleanup
+  of stale data.
+
+* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+  It didn't work and it was never a good idea anyway.
+
 * Fri Apr 01 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.13-20220401
 - Rebuilt.
 - GH#7278: BUG when there is more than one field/filter in the having
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,16 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+  as far as the table content is concerned.  The schema information
+  stays global.  This fixes an issue with concurrent access and cleanup
+  of stale data.
+
+* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- The NO CONSTRAINT option of the COPY INTO query has been removed.
+  It didn't work and it was never a good idea anyway.
+
 * 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),
diff --git a/sql/ChangeLog.Jan2022 b/sql/ChangeLog.Jan2022
--- a/sql/ChangeLog.Jan2022
+++ b/sql/ChangeLog.Jan2022
@@ -1,13 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org>
-- GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
-  as far as the table content is concerned.  The schema information
-  stays global.  This fixes an issue with concurrent access and cleanup
-  of stale data.
-
-* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org>
-- The NO CONSTRAINT option of the COPY INTO query has been removed.
-  It didn't work and it was never a good idea anyway.
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to