Changeset: f1e05acecfa3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f1e05acecfa3
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 (231 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -807,3 +807,4 @@ 8b736d6dcfd63d0560c99fc5427b504c116b74b0
 aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
 79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
 79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release
+573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5
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://github.com/MonetDB/MonetDB/issues
-Source: 
https://www.monetdb.org/downloads/sources/Jun2023/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jun2023-SP1/%{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
@@ -860,6 +860,24 @@ fi
 %endif
 
 %changelog
+* Tue Jul 18 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- Rebuilt.
+- GH#7388: Query results in large cross product
+- GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+  (163840000)
+
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- sql: An upgrade that both creates a new .snapshot user and extends the
+  sys.db_user_info table with (among others) a password column did
+  these in such a way that the passord value for the new user was NULL.
+  This is fixed by updating the password.
+
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- monetdb5: There is now a new option --set tablet_threads=N to limit the 
number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
 * 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
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 "1")
+set(GDK_VERSION_PATCH "2")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -54,13 +54,13 @@ 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 "1")
+set(MONETDB5_VERSION_PATCH "2")
 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 "2")
+set(MONETDBE_VERSION_PATCH "3")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
 # version of the STREAM library (subdirectory common/stream)
@@ -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 "1")
+set(SQL_VERSION_PATCH "2")
 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,30 @@
+monetdb (11.47.5) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7388: Query results in large cross product
+  * GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+    (163840000)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Jul 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+  * sql: An upgrade that both creates a new .snapshot user and extends the
+    sys.db_user_info table with (among others) a password column did
+    these in such a way that the passord value for the new user was NULL.
+    This is fixed by updating the password.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+  * monetdb5: There is now a new option --set tablet_threads=N to limit the 
number
+    of threads used for a COPY INTO from CSV file query.  This option can
+    also be set for a specific database using the monetdb command using
+    the ncopyintothreads property.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 13:12:19 +0200
+
 monetdb (11.47.3) 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,30 @@
+monetdb (11.47.5) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7388: Query results in large cross product
+  * GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+    (163840000)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Jul 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+  * sql: An upgrade that both creates a new .snapshot user and extends the
+    sys.db_user_info table with (among others) a password column did
+    these in such a way that the passord value for the new user was NULL.
+    This is fixed by updating the password.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+  * monetdb5: There is now a new option --set tablet_threads=N to limit the 
number
+    of threads used for a COPY INTO from CSV file query.  This option can
+    also be set for a specific database using the monetdb command using
+    the ncopyintothreads property.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jun 2023 13:12:19 +0200
+
 monetdb (11.47.3) 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,21 @@
+* Tue Jul 18 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- Rebuilt.
+- GH#7388: Query results in large cross product
+- GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+  (163840000)
+
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- sql: An upgrade that both creates a new .snapshot user and extends the
+  sys.db_user_info table with (among others) a password column did
+  these in such a way that the passord value for the new user was NULL.
+  This is fixed by updating the password.
+
+* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- monetdb5: There is now a new option --set tablet_threads=N to limit the 
number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
 * 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
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue May 23 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- There is now a new option --set tablet_threads=N to limit the number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
 * Wed Mar 1 2023 Niels Nes <ni...@monetdbsolutions.com> - 11.47.1-20230616
 - The MAL debugger code has been removed.
 
diff --git a/monetdb5/ChangeLog.Jun2023 b/monetdb5/ChangeLog.Jun2023
--- a/monetdb5/ChangeLog.Jun2023
+++ b/monetdb5/ChangeLog.Jun2023
@@ -1,9 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue May 23 2023 Sjoerd Mullender <sjo...@acm.org>
-- There is now a new option --set tablet_threads=N to limit the number
-  of threads used for a COPY INTO from CSV file query.  This option can
-  also be set for a specific database using the monetdb command using
-  the ncopyintothreads property.
-
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
 
+* Fri Jun  9 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718
+- An upgrade that both creates a new .snapshot user and extends the
+  sys.db_user_info table with (among others) a password column did
+  these in such a way that the passord value for the new user was NULL.
+  This is fixed by updating the password.
+
 * 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
 
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -1,9 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Fri Jun  9 2023 Sjoerd Mullender <sjo...@acm.org>
-- An upgrade that both creates a new .snapshot user and extends the
-  sys.db_user_info table with (among others) a password column did
-  these in such a way that the passord value for the new user was NULL.
-  This is fixed by updating the password.
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to