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

Merge with Jan2022 branch.


diffs (214 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -824,3 +824,6 @@ 1cc77329e40543d12dd9de04cbeec50d442520e9
 1cc77329e40543d12dd9de04cbeec50d442520e9 Jul2021_SP2_release
 e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_1
 e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release
+34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_3
+e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release
+34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -850,6 +850,23 @@ fi
 %endif
 
 %changelog
+* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111
+- Rebuilt.
+- GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other
+  tables
+
+* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111
+- gdk: On Windows, files and directories we create now get the attribute
+  FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
+  indexed by indexing or search services.
+
+* Thu Jan  6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> 
- 11.43.3-20220111
+- merovingian: Disabled logging into merovingian.log of next info message 
types:
+  - proxying client <host>:<port> for database '<dbname>' to <url>
+  - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
+  These messages were written to the log file at each connection. In most
+  cases this information is not used. The disabling reduces the log file size.
+
 * Mon Jan 03 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.1-20220103
 - Rebuilt.
 - GH#7168: Loosing the documentation
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 "24")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 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 "32")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "0")
+set(MONETDB5_VERSION_PATCH "1")
 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 "3")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "0")
+set(MONETDBE_VERSION_PATCH "1")
 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,29 @@
+monetdb (11.43.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other
+    tables
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 11 Jan 2022 10:46:27 +0100
+
+monetdb (11.43.3) unstable; urgency=low
+
+  * gdk: On Windows, files and directories we create now get the attribute
+    FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
+    indexed by indexing or search services.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 11 Jan 2022 10:46:27 +0100
+
+monetdb (11.43.3) unstable; urgency=low
+
+  * merovingian: Disabled logging into merovingian.log of next info message 
types:
+    - proxying client <host>:<port> for database '<dbname>' to <url>
+    - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
+    These messages were written to the log file at each connection. In most
+    cases this information is not used. The disabling reduces the log file 
size.
+
+ -- Martin van Dinther <martin.van.dint...@monetdbsolutions.com>  Thu, 6 Jan 
2022 10:46:27 +0100
+
 monetdb (11.43.1) 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
 
+* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111
+- On Windows, files and directories we create now get the attribute
+  FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
+  indexed by indexing or search services.
+
 * Mon Jan  3 2022 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.43.1-20220103
 - Implement string imprints (strimps for short) a pre-filter structure
   for strings in order to accelerate LIKE queries. If a strimp exists
diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022
--- a/gdk/ChangeLog.Jan2022
+++ b/gdk/ChangeLog.Jan2022
@@ -1,8 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org>
-- On Windows, files and directories we create now get the attribute
-  FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
-  indexed by indexing or search services.
-
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,29 @@
+monetdb (11.43.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other
+    tables
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 11 Jan 2022 10:46:27 +0100
+
+monetdb (11.43.3) unstable; urgency=low
+
+  * gdk: On Windows, files and directories we create now get the attribute
+    FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
+    indexed by indexing or search services.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 11 Jan 2022 10:46:27 +0100
+
+monetdb (11.43.3) unstable; urgency=low
+
+  * merovingian: Disabled logging into merovingian.log of next info message 
types:
+    - proxying client <host>:<port> for database '<dbname>' to <url>
+    - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
+    These messages were written to the log file at each connection. In most
+    cases this information is not used. The disabling reduces the log file 
size.
+
+ -- Martin van Dinther <martin.van.dint...@monetdbsolutions.com>  Thu, 6 Jan 
2022 10:46:27 +0100
+
 monetdb (11.43.1) 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,20 @@
+* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111
+- Rebuilt.
+- GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other
+  tables
+
+* Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111
+- gdk: On Windows, files and directories we create now get the attribute
+  FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
+  indexed by indexing or search services.
+
+* Thu Jan  6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> 
- 11.43.3-20220111
+- merovingian: Disabled logging into merovingian.log of next info message 
types:
+  - proxying client <host>:<port> for database '<dbname>' to <url>
+  - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
+  These messages were written to the log file at each connection. In most
+  cases this information is not used. The disabling reduces the log file size.
+
 * Mon Jan 03 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.1-20220103
 - Rebuilt.
 - GH#7168: Loosing the documentation
diff --git a/tools/merovingian/ChangeLog-Archive 
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Jan  6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> 
- 11.43.3-20220111
+- Disabled logging into merovingian.log of next info message types:
+  - proxying client <host>:<port> for database '<dbname>' to <url>
+  - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
+  These messages were written to the log file at each connection. In most
+  cases this information is not used. The disabling reduces the log file size.
+
 * Tue May 11 2021 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.43.1-20220103
 - Removed the deprecated monetdb commands `profilerstart` and
   `profilerstop`.
diff --git a/tools/merovingian/ChangeLog.Jan2022 
b/tools/merovingian/ChangeLog.Jan2022
--- a/tools/merovingian/ChangeLog.Jan2022
+++ b/tools/merovingian/ChangeLog.Jan2022
@@ -1,10 +1,3 @@
 # ChangeLog file for sql/src/backends/monet5/merovingian
 # This file is updated with mchangelog
 
-* Thu Jan  6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
-- Disabled logging into merovingian.log of next info message types:
-  - proxying client <host>:<port> for database '<dbname>' to <url>
-  - target connection is on local UNIX domain socket, passing on 
filedescriptor instead of proxying
-  These messages were written to the log file at each connection. In most
-  cases this information is not used. The disabling reduces the log file size.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to