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

Merge with Dec2023 branch.


diffs (300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f
 95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
 dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
 dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release
+d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,7 @@ Group: Applications/Databases
 License: MPL-2.0
 URL: https://www.monetdb.org/
 BugURL: https://github.com/MonetDB/MonetDB/issues
-Source: 
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{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
@@ -921,6 +921,31 @@ fi
 %endif
 
 %changelog
+* Tue Apr 09 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- gdk: Threads have their own list of free bats.  The list was not returned
+  to the system when a thread exited, meaning that the free bats that
+  were in the list would not be reused by any thread.  This has been
+  fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only 
one
+  of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+  aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+  never observed.
+
 * Tue Mar 12 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
 - Rebuilt.
 - GH#7390: Some MonetDB Server crashes found
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -44,7 +44,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "28")
 set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -56,13 +56,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "35")
 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)
 set(MONETDBE_VERSION_MAJOR "26")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "5")
+set(MONETDBE_VERSION_PATCH "6")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
 # version of the STREAM library (subdirectory common/stream)
@@ -74,5 +74,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "14")
 set(SQL_VERSION_MINOR "1")
-set(SQL_VERSION_PATCH "2")
+set(SQL_VERSION_PATCH "3")
 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,43 @@
+monetdb (11.49.7) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7469: Crash when using `CONTAINS`
+  * GH#7479: MonetDB server crashes in `exp_ref`
+  * GH#7490: commonTerms optimizer no longer works
+  * GH#7495: Crash when simultaneously querying and updating a string column.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 09 Apr 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * gdk: Threads have their own list of free bats.  The list was not returned
+    to the system when a thread exited, meaning that the free bats that
+    were in the list would not be reused by any thread.  This has been
+    fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 28 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * monetdb5: Fixed interaction between mserver5 and remote mserver5 when only 
one
+    of the two has 128 bit integer support.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * sql: Fixed issue where equal column aliases were created. When those
+    aliases were parsed on the remote side it could give crashes.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * gdk: Fixed a couple of deadlock situations, one actually observed, one
+    never observed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 18 Mar 2024 10:43:09 +0200
+
 monetdb (11.49.5) 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 Mar 28 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Threads have their own list of free bats.  The list was not returned
+  to the system when a thread exited, meaning that the free bats that
+  were in the list would not be reused by any thread.  This has been
+  fixed.
+
+* Mon Mar 18 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Fixed a couple of deadlock situations, one actually observed, one
+  never observed.
+
 * Fri Mar  8 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
 - The internal hash function for floating point types has been changed.
   It is now no longer based on the bit representation, but on the value,
diff --git a/gdk/ChangeLog.Dec2023 b/gdk/ChangeLog.Dec2023
--- a/gdk/ChangeLog.Dec2023
+++ b/gdk/ChangeLog.Dec2023
@@ -1,13 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Thu Mar 28 2024 Sjoerd Mullender <sjo...@acm.org>
-- Threads have their own list of free bats.  The list was not returned
-  to the system when a thread exited, meaning that the free bats that
-  were in the list would not be reused by any thread.  This has been
-  fixed.
-
-* Mon Mar 18 2024 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a couple of deadlock situations, one actually observed, one
-  never observed.
-
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,43 @@
+monetdb (11.49.7) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7469: Crash when using `CONTAINS`
+  * GH#7479: MonetDB server crashes in `exp_ref`
+  * GH#7490: commonTerms optimizer no longer works
+  * GH#7495: Crash when simultaneously querying and updating a string column.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 09 Apr 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * gdk: Threads have their own list of free bats.  The list was not returned
+    to the system when a thread exited, meaning that the free bats that
+    were in the list would not be reused by any thread.  This has been
+    fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 28 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * monetdb5: Fixed interaction between mserver5 and remote mserver5 when only 
one
+    of the two has 128 bit integer support.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * sql: Fixed issue where equal column aliases were created. When those
+    aliases were parsed on the remote side it could give crashes.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+  * gdk: Fixed a couple of deadlock situations, one actually observed, one
+    never observed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 18 Mar 2024 10:43:09 +0200
+
 monetdb (11.49.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,28 @@
+* Tue Apr 09 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- gdk: Threads have their own list of free bats.  The list was not returned
+  to the system when a thread exited, meaning that the free bats that
+  were in the list would not be reused by any thread.  This has been
+  fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only 
one
+  of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+  aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+  never observed.
+
 * Tue Mar 12 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
 - Rebuilt.
 - GH#7390: Some MonetDB Server crashes found
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Fixed interaction between mserver5 and remote mserver5 when only one
+  of the two has 128 bit integer support.
+
 * Tue Dec 19 2023 Sjoerd Mullender <sjo...@acm.org> - 11.49.1-20231221
 - Removed MAL functions bat.reuse and bat.reuseMap.
 
diff --git a/monetdb5/ChangeLog.Dec2023 b/monetdb5/ChangeLog.Dec2023
--- a/monetdb5/ChangeLog.Dec2023
+++ b/monetdb5/ChangeLog.Dec2023
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org>
-- Fixed interaction between mserver5 and remote mserver5 when only one
-  of the two has 128 bit integer support.
-
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.7-20240409
+- Fixed issue where equal column aliases were created. When those
+  aliases were parsed on the remote side it could give crashes.
+
 * Thu Mar  7 2024 Lucas Pereira <lucas.pere...@monetdbsolutions.com> - 
11.49.5-20240312
 - performance improvement of 'startswith' and 'endswith' filter functions
   for join operators
diff --git a/sql/ChangeLog.Dec2023 b/sql/ChangeLog.Dec2023
--- a/sql/ChangeLog.Dec2023
+++ b/sql/ChangeLog.Dec2023
@@ -1,7 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Tue Mar 19 2024 Sjoerd Mullender <sjo...@acm.org>
-- Fixed issue where equal column aliases were created. When those
-  aliases were parsed on the remote side it could give crashes.
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to