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

Merge with Jul2021 branch.


diffs (truncated from 319 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -820,3 +820,5 @@ 65065954ca086d01254a20cc145695fa8b9a3db2
 4b353b1f914e3c9c7493117284f9cc06677e4c71 Jul2021_SP1_release
 65065954ca086d01254a20cc145695fa8b9a3db2 Jul2021_SP1_release
 014b82412e664a306d2f5d3a2a2d49d75a6f8da5 Jan2022_root
+1cc77329e40543d12dd9de04cbeec50d442520e9 Jul2021_13
+1cc77329e40543d12dd9de04cbeec50d442520e9 Jul2021_SP2_release
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/Jul2021-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2021-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
@@ -848,6 +848,40 @@ fi
 %endif
 
 %changelog
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- Rebuilt.
+- GH#7163: Multiple sql.mvc() invocations in the same query
+- GH#7167: sys.shutdown() problems
+- GH#7184: Insert into query blocks all other queries
+- GH#7185: GROUPING SETS on groups with aliases provided in the SELECT
+  returns empty result
+- GH#7186: data files created with COPY SELECT .. INTO 'file.csv' fail to
+  be loaded using COPY INTO .. FROM 'file.csv' when double quoted string
+  data contains the field values delimiter character
+- GH#7191: [MonetDBe] monetdbe_cleanup_statement() with bound NULLs on
+  variable-sized types bug
+- GH#7196: BATproject2: does not match always
+- GH#7198: Suboptimal query plan for query containing JSON access filter
+  and two negative string comparisons
+- GH#7200: PRIMARY KEY unique constraint is violated with concurrent
+  inserts
+- GH#7206: Python UDF fails when returning an empty table as a dictionary
+
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- clients: Dumping the database now also dumps the read-only and insert-only
+  states of tables.
+
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- gdk: Sometimes when the server was restarted, it wouldn't start anymore due
+  to an error from BBPcheckbats.  We finally found and fixed a (hopefully
+  "the") cause of this problem.
+
+* Thu Oct 28 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- sql: Number parsing for SQL was fixed.  If a number was immediately followed
+  by letters (i.e. without a space), the number was accepted and the
+  alphanumeric string starting with the letter was interpreted as an alias
+  (if aliases were allowed in that position).
+
 * Thu Sep 30 2021 Sjoerd Mullender <[email protected]> - 11.41.11-20210930
 - Rebuilt.
 
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- Dumping the database now also dumps the read-only and insert-only
+  states of tables.
+
 * Tue Jul 20 2021 Sjoerd Mullender <[email protected]> - 11.41.1-20210723
 - The MonetDB stethoscope has been removed.  There is now a separate
   package available with PIP (monetdb_stethoscope) or as an RPM or DEB
diff --git a/clients/ChangeLog.Jul2021 b/clients/ChangeLog.Jul2021
--- a/clients/ChangeLog.Jul2021
+++ b/clients/ChangeLog.Jul2021
@@ -1,7 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Mon Dec 13 2021 Sjoerd Mullender <[email protected]>
-- Dumping the database now also dumps the read-only and insert-only
-  states of tables.
-
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 "23")
 set(GDK_VERSION_MINOR "0")
-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 "31")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "3")
+set(MONETDB5_VERSION_PATCH "4")
 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 "2")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "1")
+set(MONETDBE_VERSION_PATCH "2")
 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,49 @@
+monetdb (11.41.13) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7163: Multiple sql.mvc() invocations in the same query
+  * GH#7167: sys.shutdown() problems
+  * GH#7184: Insert into query blocks all other queries
+  * GH#7185: GROUPING SETS on groups with aliases provided in the SELECT
+    returns empty result
+  * GH#7186: data files created with COPY SELECT .. INTO 'file.csv' fail to
+    be loaded using COPY INTO .. FROM 'file.csv' when double quoted string
+    data contains the field values delimiter character
+  * GH#7191: [MonetDBe] monetdbe_cleanup_statement() with bound NULLs on
+    variable-sized types bug
+  * GH#7196: BATproject2: does not match always
+  * GH#7198: Suboptimal query plan for query containing JSON access filter
+    and two negative string comparisons
+  * GH#7200: PRIMARY KEY unique constraint is violated with concurrent
+    inserts
+  * GH#7206: Python UDF fails when returning an empty table as a dictionary
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * clients: Dumping the database now also dumps the read-only and insert-only
+    states of tables.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * gdk: Sometimes when the server was restarted, it wouldn't start anymore due
+    to an error from BBPcheckbats.  We finally found and fixed a (hopefully
+    "the") cause of this problem.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * sql: Number parsing for SQL was fixed.  If a number was immediately 
followed
+    by letters (i.e. without a space), the number was accepted and the
+    alphanumeric string starting with the letter was interpreted as an alias
+    (if aliases were allowed in that position).
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 28 Oct 2021 10:01:08 +0100
+
 monetdb (11.41.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,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- Sometimes when the server was restarted, it wouldn't start anymore due
+  to an error from BBPcheckbats.  We finally found and fixed a (hopefully
+  "the") cause of this problem.
+
 * Wed Sep 22 2021 Sjoerd Mullender <[email protected]> - 11.41.7-20210927
 - Some deadlock and race condition issues were fixed.
 - Handling of the list of free bats has been improved, leading to less
diff --git a/gdk/ChangeLog.Jul2021 b/gdk/ChangeLog.Jul2021
--- a/gdk/ChangeLog.Jul2021
+++ b/gdk/ChangeLog.Jul2021
@@ -1,8 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Mon Dec 13 2021 Sjoerd Mullender <[email protected]>
-- Sometimes when the server was restarted, it wouldn't start anymore due
-  to an error from BBPcheckbats.  We finally found and fixed a (hopefully
-  "the") cause of this problem.
-
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,49 @@
+monetdb (11.41.13) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7163: Multiple sql.mvc() invocations in the same query
+  * GH#7167: sys.shutdown() problems
+  * GH#7184: Insert into query blocks all other queries
+  * GH#7185: GROUPING SETS on groups with aliases provided in the SELECT
+    returns empty result
+  * GH#7186: data files created with COPY SELECT .. INTO 'file.csv' fail to
+    be loaded using COPY INTO .. FROM 'file.csv' when double quoted string
+    data contains the field values delimiter character
+  * GH#7191: [MonetDBe] monetdbe_cleanup_statement() with bound NULLs on
+    variable-sized types bug
+  * GH#7196: BATproject2: does not match always
+  * GH#7198: Suboptimal query plan for query containing JSON access filter
+    and two negative string comparisons
+  * GH#7200: PRIMARY KEY unique constraint is violated with concurrent
+    inserts
+  * GH#7206: Python UDF fails when returning an empty table as a dictionary
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * clients: Dumping the database now also dumps the read-only and insert-only
+    states of tables.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * gdk: Sometimes when the server was restarted, it wouldn't start anymore due
+    to an error from BBPcheckbats.  We finally found and fixed a (hopefully
+    "the") cause of this problem.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 13 Dec 2021 10:01:08 +0100
+
+monetdb (11.41.13) unstable; urgency=low
+
+  * sql: Number parsing for SQL was fixed.  If a number was immediately 
followed
+    by letters (i.e. without a space), the number was accepted and the
+    alphanumeric string starting with the letter was interpreted as an alias
+    (if aliases were allowed in that position).
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 28 Oct 2021 10:01:08 +0100
+
 monetdb (11.41.11) 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,37 @@
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- Rebuilt.
+- GH#7163: Multiple sql.mvc() invocations in the same query
+- GH#7167: sys.shutdown() problems
+- GH#7184: Insert into query blocks all other queries
+- GH#7185: GROUPING SETS on groups with aliases provided in the SELECT
+  returns empty result
+- GH#7186: data files created with COPY SELECT .. INTO 'file.csv' fail to
+  be loaded using COPY INTO .. FROM 'file.csv' when double quoted string
+  data contains the field values delimiter character
+- GH#7191: [MonetDBe] monetdbe_cleanup_statement() with bound NULLs on
+  variable-sized types bug
+- GH#7196: BATproject2: does not match always
+- GH#7198: Suboptimal query plan for query containing JSON access filter
+  and two negative string comparisons
+- GH#7200: PRIMARY KEY unique constraint is violated with concurrent
+  inserts
+- GH#7206: Python UDF fails when returning an empty table as a dictionary
+
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- clients: Dumping the database now also dumps the read-only and insert-only
+  states of tables.
+
+* Mon Dec 13 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- gdk: Sometimes when the server was restarted, it wouldn't start anymore due
+  to an error from BBPcheckbats.  We finally found and fixed a (hopefully
+  "the") cause of this problem.
+
+* Thu Oct 28 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- sql: Number parsing for SQL was fixed.  If a number was immediately followed
+  by letters (i.e. without a space), the number was accepted and the
+  alphanumeric string starting with the letter was interpreted as an alias
+  (if aliases were allowed in that position).
+
 * Thu Sep 30 2021 Sjoerd Mullender <[email protected]> - 11.41.11-20210930
 - Rebuilt.
 
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Oct 28 2021 Sjoerd Mullender <[email protected]> - 11.41.13-20211213
+- Number parsing for SQL was fixed.  If a number was immediately followed
+  by letters (i.e. without a space), the number was accepted and the
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to