Changeset: e915d4a508c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e915d4a508c6
Modified Files:
        .hgtags
        MonetDB.spec
        cmake/monetdb-versions.cmake
        debian/changelog
        misc/packages/deb/changelog
        misc/packages/rpm/changelog
Branch: default
Log Message:

Merge with Jun2023 branch.


diffs (283 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -805,3 +805,4 @@ d11af9398029c117b92a9be9efa971ac0299ffc4
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release
 aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
+79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,30 @@ fi
 %endif
 
 %changelog
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
+- Rebuilt.
+- GH#7344: Database upgrade failure due to user object dependency on
+  system procedure
+- GH#7378: MonetDB server crashes at sql_trans_copy_key
+- GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+- GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+- GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+- GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+- GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+- GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+- GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+- GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+* Tue Jun 20 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
+- clients: The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
+* Fri Jun 16 2023 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com> - 
11.47.3-20230622
+- sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
 * Fri Jun 16 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.1-20230616
 - Rebuilt.
 - GH#7311: Missing `REGEXP_REPLACE` function.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Jun 20 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
+- The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
 * Mon Apr 17 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.15-20230530
 - If the number of rows in mclient is set to 0 (using either --rows=0
   option or \r0 on the mclient command line), the internal pager is used
diff --git a/clients/ChangeLog.Jun2023 b/clients/ChangeLog.Jun2023
--- a/clients/ChangeLog.Jun2023
+++ b/clients/ChangeLog.Jun2023
@@ -1,10 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Tue Jun 20 2023 Sjoerd Mullender <sjo...@acm.org>
-- The COPY INTO from file ON CLIENT was extended to also look for a
-  relative path name relative to the file from which the query was read.
-  This is only possible if the name of the query file is known, so when
-  it is specified on the command line or read using the interactive
-  \< command.
-
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -6,7 +6,7 @@
 .\"
 .\" Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 .\"
-.TH MCLIENT 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MCLIENT 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 mclient \- the MonetDB command-line tool
 .SH SYNOPSIS
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 "27")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -54,7 +54,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "34")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "0")
+set(MONETDB5_VERSION_PATCH "1")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
@@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "14")
 set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "0")
+set(SQL_VERSION_PATCH "1")
 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,36 @@
+monetdb (11.47.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7344: Database upgrade failure due to user object dependency on
+    system procedure
+  * GH#7378: MonetDB server crashes at sql_trans_copy_key
+  * GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+  * GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+  * GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+  * GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+  * GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+  * GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+  * GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+  * GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 11:58:29 +0200
+
+monetdb (11.47.3) unstable; urgency=low
+
+  * clients: The COPY INTO from file ON CLIENT was extended to also look for a
+    relative path name relative to the file from which the query was read.
+    This is only possible if the name of the query file is known, so when
+    it is specified on the command line or read using the interactive
+    \< command.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 20 Jun 2023 11:58:29 +0200
+
+monetdb (11.47.3) unstable; urgency=low
+
+  * sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
+ -- Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>  Fri, 16 Jun 2023 
11:58:29 +0200
+
 monetdb (11.47.1) unstable; urgency=low
 
   * Rebuilt.
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,36 @@
+monetdb (11.47.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7344: Database upgrade failure due to user object dependency on
+    system procedure
+  * GH#7378: MonetDB server crashes at sql_trans_copy_key
+  * GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+  * GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+  * GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+  * GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+  * GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+  * GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+  * GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+  * GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 11:58:29 +0200
+
+monetdb (11.47.3) unstable; urgency=low
+
+  * clients: The COPY INTO from file ON CLIENT was extended to also look for a
+    relative path name relative to the file from which the query was read.
+    This is only possible if the name of the query file is known, so when
+    it is specified on the command line or read using the interactive
+    \< command.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 20 Jun 2023 11:58:29 +0200
+
+monetdb (11.47.3) unstable; urgency=low
+
+  * sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
+ -- Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>  Fri, 16 Jun 2023 
11:58:29 +0200
+
 monetdb (11.47.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,27 @@
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
+- Rebuilt.
+- GH#7344: Database upgrade failure due to user object dependency on
+  system procedure
+- GH#7378: MonetDB server crashes at sql_trans_copy_key
+- GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+- GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+- GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+- GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+- GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+- GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+- GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+- GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+* Tue Jun 20 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
+- clients: The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
+* Fri Jun 16 2023 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com> - 
11.47.3-20230622
+- sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
 * Fri Jun 16 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.1-20230616
 - Rebuilt.
 - GH#7311: Missing `REGEXP_REPLACE` function.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Jun 16 2023 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com> - 
11.47.3-20230622
+- Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
 * Tue May 30 2023 Lucas Pereira <lucas.pere...@monetdbsolutions.com> - 
11.47.1-20230616
 - Function 'similarity(x string, y string)' marked as deprecated and will
   be removed in the next release.
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -1,6 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Fri Jun 16 2023 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>
-- Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
-
diff --git a/tools/merovingian/client/monetdb.1 
b/tools/merovingian/client/monetdb.1
--- a/tools/merovingian/client/monetdb.1
+++ b/tools/merovingian/client/monetdb.1
@@ -9,7 +9,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MONETDB 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MONETDB 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 monetdb \- control a MonetDB Database Server instance
 .SH SYNOPSIS
diff --git a/tools/merovingian/daemon/monetdbd.1.in 
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -9,7 +9,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MONETDBD 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MONETDBD 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 monetdbd \- the MonetDB Database Server daemon
 .SH SYNOPSIS
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -9,7 +9,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MSERVER5 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MSERVER5 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 mserver5 \- the MonetDB server version 5
 .SH SYNOPSIS
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to