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

Merge with Sep2022 branch.


diffs (truncated from 475 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -790,3 +790,4 @@ 43d4a717410d6f6692a16a878640fc7e0f248725
 5c50a4071c86d1621e20a885a51cc36f2f23eec4 Sep2022_9
 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_11
 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release
+e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
 License: MPL-2.0
 URL: https://www.monetdb.org/
 BugURL: https://bugs.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Sep2022-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Sep2022-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
@@ -858,6 +858,54 @@ fi
 %endif
 
 %changelog
+* Tue Jan 24 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- Rebuilt.
+- GH#7343: GDKmmap requesting 0 virtual memory
+- GH#7347: A bug where an exception occurs even though it is a query with
+  normal syntax (Merge Table)
+
+* Mon Jan 23 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- sql: Fixed a regression where when there are multiple concurrent
+  transactions, the dependencies weren't checked properly.
+
+* Mon Jan 16 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- gdk: Fixed a race condition that could lead to a bat being added to the SQL
+  catalog but nog being made persistent, causing a subsequent restart
+  of the system to fail (and crash).
+
+* Wed Jan  4 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- odbc: A crash in the ODBC driver was fixed when certain unsupported functions
+  where used in a {fn ...} escape.
+
+* Wed Dec 21 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- odbc: Prepare of a query where the sum of the number of parameters (question
+  marks in the query) and the number of output columns is larger than
+  100 could fail with an unexpected error.  This has been fixed.
+
+* Fri Dec 16 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- sql: Added some error checking to prevent crashes.  Errors would mainly
+  occur under memory pressure.
+
+* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- gdk: Fixed a race condition where a hash could have been created on a
+  bat using the old bat count while in another thread the bat count
+  got updated.  This would make the hash be based on too small a size,
+  causing failures later on.
+
+* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- sql: Fixed cleanup after a failed allocation where the data being cleaned
+  up was unitialized but still used as pointers to memory that also had
+  to be freed.
+
+* Thu Dec  8 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- gdk: When extending a bat failed, the capacity had been updated already and
+  was therefore too large.  This could then later cause a crash.  This has
+  been fixed by only updating the capacity if the extend succeeded.
+
+* Wed Dec  7 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- sql: Fixed a double cleanup after a failed allocation in COPY INTO.  The
+  double cleanup could cause a crash due to a race condition it enabled.
+
 * Mon Dec 05 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.11-20221205
 - Rebuilt.
 - GH#7342: column which datatype is double couldn't group or aggregation
diff --git a/clients/odbc/ChangeLog-Archive b/clients/odbc/ChangeLog-Archive
--- a/clients/odbc/ChangeLog-Archive
+++ b/clients/odbc/ChangeLog-Archive
@@ -1,6 +1,15 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Jan  4 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- A crash in the ODBC driver was fixed when certain unsupported functions
+  where used in a {fn ...} escape.
+
+* Wed Dec 21 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- Prepare of a query where the sum of the number of parameters (question
+  marks in the query) and the number of output columns is larger than
+  100 could fail with an unexpected error.  This has been fixed.
+
 * Thu Oct 13 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> 
- 11.45.9-20221128
 - Fixed issue with generated raw strings prefix when ODBC driver is used
   against a server older than Jun2020 (11.37).
diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022
--- a/clients/odbc/ChangeLog.Sep2022
+++ b/clients/odbc/ChangeLog.Sep2022
@@ -1,12 +1,3 @@
 # ChangeLog file for odbc
 # This file is updated with Maddlog
 
-* Wed Jan  4 2023 Sjoerd Mullender <sjo...@acm.org>
-- A crash in the ODBC driver was fixed when certain unsupported functions
-  where used in a {fn ...} escape.
-
-* Wed Dec 21 2022 Sjoerd Mullender <sjo...@acm.org>
-- Prepare of a query where the sum of the number of parameters (question
-  marks in the query) and the number of output columns is larger than
-  100 could fail with an unexpected error.  This has been fixed.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "26")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "3")
+set(GDK_VERSION_PATCH "4")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -54,23 +54,23 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "33")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "3")
+set(MONETDB5_VERSION_PATCH "4")
 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 "0")
+set(MONETDBE_VERSION_PATCH "1")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
 # version of the STREAM library (subdirectory common/stream)
 set(STREAM_VERSION_MAJOR "26")
 set(STREAM_VERSION_MINOR "0")
-set(STREAM_VERSION_PATCH "1")
+set(STREAM_VERSION_PATCH "2")
 set(STREAM_VERSION 
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
 
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "13")
 set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "3")
+set(SQL_VERSION_PATCH "4")
 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,81 @@
+monetdb (11.45.13) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7343: GDKmmap requesting 0 virtual memory
+  * GH#7347: A bug where an exception occurs even though it is a query with
+    normal syntax (Merge Table)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Jan 2023 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * sql: Fixed a regression where when there are multiple concurrent
+    transactions, the dependencies weren't checked properly.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 23 Jan 2023 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * gdk: Fixed a race condition that could lead to a bat being added to the SQL
+    catalog but nog being made persistent, causing a subsequent restart
+    of the system to fail (and crash).
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 16 Jan 2023 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * odbc: A crash in the ODBC driver was fixed when certain unsupported 
functions
+    where used in a {fn ...} escape.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 4 Jan 2023 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * odbc: Prepare of a query where the sum of the number of parameters 
(question
+    marks in the query) and the number of output columns is larger than
+    100 could fail with an unexpected error.  This has been fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 21 Dec 2022 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * sql: Added some error checking to prevent crashes.  Errors would mainly
+    occur under memory pressure.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 16 Dec 2022 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * gdk: Fixed a race condition where a hash could have been created on a
+    bat using the old bat count while in another thread the bat count
+    got updated.  This would make the hash be based on too small a size,
+    causing failures later on.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 14 Dec 2022 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * sql: Fixed cleanup after a failed allocation where the data being cleaned
+    up was unitialized but still used as pointers to memory that also had
+    to be freed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 14 Dec 2022 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * gdk: When extending a bat failed, the capacity had been updated already and
+    was therefore too large.  This could then later cause a crash.  This has
+    been fixed by only updating the capacity if the extend succeeded.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 8 Dec 2022 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * sql: Fixed a double cleanup after a failed allocation in COPY INTO.  The
+    double cleanup could cause a crash due to a race condition it enabled.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 7 Dec 2022 13:18:55 +0100
+
 monetdb (11.45.11) 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,22 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Jan 16 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- Fixed a race condition that could lead to a bat being added to the SQL
+  catalog but nog being made persistent, causing a subsequent restart
+  of the system to fail (and crash).
+
+* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- Fixed a race condition where a hash could have been created on a
+  bat using the old bat count while in another thread the bat count
+  got updated.  This would make the hash be based on too small a size,
+  causing failures later on.
+
+* Thu Dec  8 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124
+- When extending a bat failed, the capacity had been updated already and
+  was therefore too large.  This could then later cause a crash.  This has
+  been fixed by only updating the capacity if the extend succeeded.
+
 * Wed Nov  9 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.9-20221128
 - On Windows, use the wide-character interface of system calls when
   dealing with the environment (i.e. file names and getenv()).
diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,19 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Mon Jan 16 2023 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a race condition that could lead to a bat being added to the SQL
-  catalog but nog being made persistent, causing a subsequent restart
-  of the system to fail (and crash).
-
-* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a race condition where a hash could have been created on a
-  bat using the old bat count while in another thread the bat count
-  got updated.  This would make the hash be based on too small a size,
-  causing failures later on.
-
-* Thu Dec  8 2022 Sjoerd Mullender <sjo...@acm.org>
-- When extending a bat failed, the capacity had been updated already and
-  was therefore too large.  This could then later cause a crash.  This has
-  been fixed by only updating the capacity if the extend succeeded.
-
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,81 @@
+monetdb (11.45.13) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7343: GDKmmap requesting 0 virtual memory
+  * GH#7347: A bug where an exception occurs even though it is a query with
+    normal syntax (Merge Table)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Jan 2023 13:18:55 +0100
+
+monetdb (11.45.13) unstable; urgency=low
+
+  * sql: Fixed a regression where when there are multiple concurrent
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to