Changeset: 0771cc485a16 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0771cc485a16
Modified Files:
        .hgtags
        MonetDB.spec
        cmake/monetdb-versions.cmake
Branch: Jul2021
Log Message:

Merge with Oct2020 branch.


diffs (truncated from 362 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -801,3 +801,5 @@ 17d27ad30941c81e4bc700300912e84e9b9a8c37
 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_15
 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_SP4_release
 02fd591b7d3311d566007e1bfb0c59682b17f12c Jul2021_root
+5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_17
+5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_SP5_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -84,7 +84,7 @@ Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
 BugURL: https://bugs.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Oct2020-SP4/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Oct2020-SP5/%{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
@@ -827,6 +827,41 @@ else
 fi
 
 %changelog
+* Mon May 03 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- Rebuilt.
+- GH#2430: JDBC: support for streams
+- GH#3336: DB files not removed if all rows are deleted, even after restart
+- GH#7104: Monetdbe NTILE function does not produce correct ordering
+- GH#7108: Monetdb crashes on query execution
+- GH#7109: MERGE Statement incorrectly reports that input relation matches
+  multiple rows
+- GH#7110: Monetdb Query parsing consistency issues in the latest release
+  (Remote Table)
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- gdk: A bug that would very occasionally produce an error "strPut: incorrectly
+  encoded UTF-8", even when no incorrectly coded characters are used
+  at all, has been fixed.  It was the result of a rare combination of
+  strings having been added to the column that caused essentially an
+  off-by-one type of error to occur.
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- merovingian: When stopping monetdbd using the `monetdbd stop' command, this 
command
+  now waits for 5 seconds longer than the exittimeout value before it
+  kills the monetdbd daemon instead of only 30 seconds total (or until
+  that daemon stops earlier).  This gives the daemon enough time to
+  terminate the mserver5 processes that it is managing.  If exittimeout
+  is negative, the daemon and the monetdbd process initiating the stop
+  wait indefinitely until the mserver5 processes have stopped.
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- sql: A bug where a sequence of TRUNCATE TABLE and COPY INTO the just
+  truncated table would result in success being reported to both queries,
+  but the table still being empty afterwards, has been fixed.
+
+* Fri Apr 23 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- NT: Added the monetdbe library to the Windows installer.
+
 * Fri Apr 02 2021 Sjoerd Mullender <[email protected]> - 11.39.15-20210402
 - Rebuilt.
 - GH#6786: function json.isvalid(js json) is not useful, could be removed
diff --git a/NT/ChangeLog-Archive b/NT/ChangeLog-Archive
new file mode 100644
--- /dev/null
+++ b/NT/ChangeLog-Archive
@@ -0,0 +1,6 @@
+# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
+# This file contains past ChangeLog entries
+
+* Fri Apr 23 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- Added the monetdbe library to the Windows installer.
+
diff --git a/NT/ChangeLog.Oct2020 b/NT/ChangeLog.Oct2020
--- a/NT/ChangeLog.Oct2020
+++ b/NT/ChangeLog.Oct2020
@@ -1,6 +1,3 @@
 # ChangeLog file for NT
 # This file is updated with Maddlog
 
-* Fri Apr 23 2021 Sjoerd Mullender <[email protected]>
-- Added the monetdbe library to the Windows installer.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -53,7 +53,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_CURRENT "22")
 set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "3")
+set(GDK_VERSION_PATCH "4")
 math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
@@ -67,14 +67,14 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_CURRENT "30")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "6")
+set(MONETDB5_VERSION_PATCH "7")
 math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} - 
${MONETDB5_VERSION_MINOR}")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
 set(MONETDBE_VERSION_CURRENT "1")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "2")
+set(MONETDBE_VERSION_PATCH "3")
 math(EXPR MONETDBE_VERSION_MAJOR "${MONETDBE_VERSION_CURRENT} - 
${MONETDBE_VERSION_MINOR}")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+monetdb (11.39.17) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#2430: JDBC: support for streams
+  * GH#3336: DB files not removed if all rows are deleted, even after restart
+  * GH#7104: Monetdbe NTILE function does not produce correct ordering
+  * GH#7108: Monetdb crashes on query execution
+  * GH#7109: MERGE Statement incorrectly reports that input relation matches
+    multiple rows
+  * GH#7110: Monetdb Query parsing consistency issues in the latest release
+    (Remote Table)
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 03 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * gdk: A bug that would very occasionally produce an error "strPut: 
incorrectly
+    encoded UTF-8", even when no incorrectly coded characters are used
+    at all, has been fixed.  It was the result of a rare combination of
+    strings having been added to the column that caused essentially an
+    off-by-one type of error to occur.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * merovingian: When stopping monetdbd using the `monetdbd stop' command, 
this command
+    now waits for 5 seconds longer than the exittimeout value before it
+    kills the monetdbd daemon instead of only 30 seconds total (or until
+    that daemon stops earlier).  This gives the daemon enough time to
+    terminate the mserver5 processes that it is managing.  If exittimeout
+    is negative, the daemon and the monetdbd process initiating the stop
+    wait indefinitely until the mserver5 processes have stopped.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * sql: A bug where a sequence of TRUNCATE TABLE and COPY INTO the just
+    truncated table would result in success being reported to both queries,
+    but the table still being empty afterwards, has been fixed.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * NT: Added the monetdbe library to the Windows installer.
+
+ -- Sjoerd Mullender <[email protected]>  Fri, 23 Apr 2021 18:04:16 +0200
+
 monetdb (11.39.15) 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,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- A bug that would very occasionally produce an error "strPut: incorrectly
+  encoded UTF-8", even when no incorrectly coded characters are used
+  at all, has been fixed.  It was the result of a rare combination of
+  strings having been added to the column that caused essentially an
+  off-by-one type of error to occur.
+
 * Tue Jun  9 2020 Sjoerd Mullender <[email protected]> - 11.37.9-20200720
 - Hash buckets come in variable widths.  But if a BAT grows long enough so
   that the BAT indexes that are stored in the buckets don't fit anymore,
diff --git a/gdk/ChangeLog.Oct2020 b/gdk/ChangeLog.Oct2020
--- a/gdk/ChangeLog.Oct2020
+++ b/gdk/ChangeLog.Oct2020
@@ -1,10 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Mon May  3 2021 Sjoerd Mullender <[email protected]>
-- A bug that would very occasionally produce an error "strPut: incorrectly
-  encoded UTF-8", even when no incorrectly coded characters are used
-  at all, has been fixed.  It was the result of a rare combination of
-  strings having been added to the column that caused essentially an
-  off-by-one type of error to occur.
-
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,53 @@
+monetdb (11.39.17) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#2430: JDBC: support for streams
+  * GH#3336: DB files not removed if all rows are deleted, even after restart
+  * GH#7104: Monetdbe NTILE function does not produce correct ordering
+  * GH#7108: Monetdb crashes on query execution
+  * GH#7109: MERGE Statement incorrectly reports that input relation matches
+    multiple rows
+  * GH#7110: Monetdb Query parsing consistency issues in the latest release
+    (Remote Table)
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 03 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * gdk: A bug that would very occasionally produce an error "strPut: 
incorrectly
+    encoded UTF-8", even when no incorrectly coded characters are used
+    at all, has been fixed.  It was the result of a rare combination of
+    strings having been added to the column that caused essentially an
+    off-by-one type of error to occur.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * merovingian: When stopping monetdbd using the `monetdbd stop' command, 
this command
+    now waits for 5 seconds longer than the exittimeout value before it
+    kills the monetdbd daemon instead of only 30 seconds total (or until
+    that daemon stops earlier).  This gives the daemon enough time to
+    terminate the mserver5 processes that it is managing.  If exittimeout
+    is negative, the daemon and the monetdbd process initiating the stop
+    wait indefinitely until the mserver5 processes have stopped.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * sql: A bug where a sequence of TRUNCATE TABLE and COPY INTO the just
+    truncated table would result in success being reported to both queries,
+    but the table still being empty afterwards, has been fixed.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 3 May 2021 18:04:16 +0200
+
+monetdb (11.39.17) unstable; urgency=low
+
+  * NT: Added the monetdbe library to the Windows installer.
+
+ -- Sjoerd Mullender <[email protected]>  Fri, 23 Apr 2021 18:04:16 +0200
+
 monetdb (11.39.15) 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,38 @@
+* Mon May 03 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- Rebuilt.
+- GH#2430: JDBC: support for streams
+- GH#3336: DB files not removed if all rows are deleted, even after restart
+- GH#7104: Monetdbe NTILE function does not produce correct ordering
+- GH#7108: Monetdb crashes on query execution
+- GH#7109: MERGE Statement incorrectly reports that input relation matches
+  multiple rows
+- GH#7110: Monetdb Query parsing consistency issues in the latest release
+  (Remote Table)
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- gdk: A bug that would very occasionally produce an error "strPut: incorrectly
+  encoded UTF-8", even when no incorrectly coded characters are used
+  at all, has been fixed.  It was the result of a rare combination of
+  strings having been added to the column that caused essentially an
+  off-by-one type of error to occur.
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- merovingian: When stopping monetdbd using the `monetdbd stop' command, this 
command
+  now waits for 5 seconds longer than the exittimeout value before it
+  kills the monetdbd daemon instead of only 30 seconds total (or until
+  that daemon stops earlier).  This gives the daemon enough time to
+  terminate the mserver5 processes that it is managing.  If exittimeout
+  is negative, the daemon and the monetdbd process initiating the stop
+  wait indefinitely until the mserver5 processes have stopped.
+
+* Mon May  3 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- sql: A bug where a sequence of TRUNCATE TABLE and COPY INTO the just
+  truncated table would result in success being reported to both queries,
+  but the table still being empty afterwards, has been fixed.
+
+* Fri Apr 23 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
+- NT: Added the monetdbe library to the Windows installer.
+
 * Fri Apr 02 2021 Sjoerd Mullender <[email protected]> - 11.39.15-20210402
 - Rebuilt.
 - GH#6786: function json.isvalid(js json) is not useful, could be removed
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to