MonetDB: groupjoin - Merge with default branch.
Changeset: 97fb50e12724 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/97fb50e12724
Modified Files:
gdk/gdk.h
gdk/gdk_join.c
sql/backends/monet5/sql_scenario.c
Branch: groupjoin
Log Message:
Merge with default branch.
diffs (truncated from 3032 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -809,3 +809,5 @@ 79dbf838f04483a2d9ccce8332090ff91b18caec
79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release
+ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7
+1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,15 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Aug 30 2023 Sjoerd Mullender - 11.47.7-20230925
+- Do a lot more error checking, mostly for allocation failures. More is
+ still needed, though.
+
+* Thu Aug 10 2023 Panagiotis Koutsourakis -
11.47.7-20230925
+- Improve performance of the ILIKE operator when the pattern contains only
+ ASCII characters. In this case we do not need to treat any characters as
+ UTF-8 and we can use much faster routines that perform byte comparisons.
+
* Wed Jan 12 2022 Sjoerd Mullender - 11.43.5-20220118
- A couple of concurrency issues have been fixed.
diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023
--- a/ChangeLog.Jun2023
+++ b/ChangeLog.Jun2023
@@ -1,12 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Wed Aug 30 2023 Sjoerd Mullender
-- Do a lot more error checking, mostly for allocation failures. More is
- still needed, though.
-
-* Thu Aug 10 2023 Panagiotis Koutsourakis
-- Improve performance of the ILIKE operator when the pattern contains only
- ASCII characters. In this case we do not need to treat any characters as
- UTF-8 and we can use much faster routines that perform byte comparisons.
-
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-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023-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
@@ -860,6 +860,48 @@ fi
%endif
%changelog
+* Wed Sep 27 2023 Sjoerd Mullender - 11.47.9-20230927
+- Rebuilt.
+- GH#7402: Privileges on merge table not propagated to partition tables
+
+* Mon Sep 25 2023 Sjoerd Mullender - 11.47.7-20230925
+- Rebuilt.
+- GH#7094: Drop remote tables in transactions and rollback
+- GH#7303: Improve the performance of multi-column filters
+- GH#7400: VM max memory is not check correctly for cgroups v2
+- GH#7401: Column aliases used incorrectly in UNION subqueries
+
+* Fri Sep 22 2023 Sjoerd Mullender - 11.47.7-20230925
+- gdk: Fixed a number of data races (race conditions).
+
+* Mon Sep 18 2023 Sjoerd Mullender - 11.47.7-20230925
+- gdk: Fixed a reference counting problem when a BAT could nog be loaded,
+ e.g. because of resource limitations.
+
+* Wed Aug 30 2023 Sjoerd Mullender - 11.47.7-20230925
+- gdk: Only check for virtual memory limits when creating or growing bats,
+ not for general memory allocations. There is (still) too much code
+ that doesn't properly handle failing allocations, so we need to avoid
+ those as much as possible. This has mostly an effect if there are
+ virtual memory size restrictions imposed by cgroups (memory.swap.max
+ in cgroups v2, memory.memsw.limit_in_bytes in cgroups v1).
+- gdk: The low-level commit turned out to always commit every persistent bat
+ in the system. There is no need for that, it should only commit bats
+ that were changed. This has now been fixed.
+- gdk: Implemented timeout/exit checks in a bunch more operators. Long(er)
+ running operators occasionally check whether they're taking too long
+ (past a user-specified timeout) or whether the server is exiting.
+ This is now done in more places.
+
+* Wed Aug 30 2023 Sjoerd Mullender - 11.47.7-20230925
+- MonetDB: Do a lot more error checking, mostly for allocation failures. More
is
+ still needed, though.
+
+* Thu Aug 10 2023 Panagiotis Koutsourakis -
11.47.7-20230925
+- MonetDB: Improve performance of the ILIKE operator when the pattern contains
only
+ ASCII characters. In this case we do not need to treat any characters as
+ UTF-8 and we can use much faster routines that perform byte comparisons.
+
* Tue Jul 18 2023 Sjoerd Mullender - 11.47.5-20230718
- Rebuilt.
- GH#7388: Query results in large cross product
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: df208375df1b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/df208375df1b Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with Jun2023 branch, not changing any files.. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Post release build.
Changeset: fcd3857e52b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fcd3857e52b6
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Post release build.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.9
+current_version = 11.47.10
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.9
+%global version 11.47.10
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,9)
- PRODUCTVERSION version(11,47,9)
+ FILEVERSION version(11,47,10)
+ PRODUCTVERSION version(11,47,10)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,9)
+ VALUE "FileVersion", sversion(11,47,10)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,9)
+ VALUE "ProductVersion", sversion(11,47,10)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,9)
- PRODUCTVERSION version(11,47,9)
+ FILEVERSION version(11,47,10)
+ PRODUCTVERSION version(11,47,10)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,9)
+ VALUE "FileVersion", sversion(11,47,10)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,9)
+ VALUE "ProductVersion", sversion(11,47,10)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,9)
- PRODUCTVERSION version(11,47,9)
+ FILEVERSION version(11,47,10)
+ PRODUCTVERSION version(11,47,10)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,9)
+VALUE "FileVersion", sversion(11,47,10)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,9)
+VALUE "ProductVersion", sversion(11,47,10)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "9")
+set(MONETDB_VERSION_PATCH "10")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jun2023-SP2")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@
MonetDB: default - Merge with Jun2023 branch.
Changeset: 75a712549826 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/75a712549826
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 (101 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -810,3 +810,4 @@ 79dbf838f04483a2d9ccce8332090ff91b18caec
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release
ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7
+1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,13 +860,16 @@ fi
%endif
%changelog
+* Wed Sep 27 2023 Sjoerd Mullender - 11.47.9-20230927
+- Rebuilt.
+- GH#7402: Privileges on merge table not propagated to partition tables
+
* Mon Sep 25 2023 Sjoerd Mullender - 11.47.7-20230925
- Rebuilt.
- GH#7094: Drop remote tables in transactions and rollback
- GH#7303: Improve the performance of multi-column filters
- GH#7400: VM max memory is not check correctly for cgroups v2
- GH#7401: Column aliases used incorrectly in UNION subqueries
-- GH#7402: Privileges on merge table not propagated to partition tables
* Fri Sep 22 2023 Sjoerd Mullender - 11.47.7-20230925
- gdk: Fixed a number of data races (race conditions).
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -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 "3")
+set(SQL_VERSION_PATCH "4")
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,10 @@
+monetdb (11.47.9) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7402: Privileges on merge table not propagated to partition tables
+
+ -- Sjoerd Mullender Wed, 27 Sep 2023 09:04:30 +0200
+
monetdb (11.47.7) unstable; urgency=low
* Rebuilt.
@@ -5,7 +12,6 @@ monetdb (11.47.7) unstable; urgency=low
* GH#7303: Improve the performance of multi-column filters
* GH#7400: VM max memory is not check correctly for cgroups v2
* GH#7401: Column aliases used incorrectly in UNION subqueries
- * GH#7402: Privileges on merge table not propagated to partition tables
-- Sjoerd Mullender Mon, 25 Sep 2023 12:24:55 +0200
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,10 @@
+monetdb (11.47.9) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7402: Privileges on merge table not propagated to partition tables
+
+ -- Sjoerd Mullender Wed, 27 Sep 2023 09:04:30 +0200
+
monetdb (11.47.7) unstable; urgency=low
* Rebuilt.
@@ -5,7 +12,6 @@ monetdb (11.47.7) unstable; urgency=low
* GH#7303: Improve the performance of multi-column filters
* GH#7400: VM max memory is not check correctly for cgroups v2
* GH#7401: Column aliases used incorrectly in UNION subqueries
- * GH#7402: Privileges on merge table not propagated to partition tables
-- Sjoerd Mullender Mon, 25 Sep 2023 12:24:55 +0200
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,10 +1,13 @@
+* Wed Sep 27 2023 Sjoerd Mullender - 11.47.9-20230927
+- Rebuilt.
+- GH#7402: Privileges on merge table not propagated to partition tables
+
* Mon Sep 25 2023 Sjoerd Mullender - 11.47.7-20230925
- Rebuilt.
- GH#7094: Drop remote tables in transactions and rollback
- GH#7303: Improve the performance of multi-column filters
- GH#7400: VM max memory is not check correctly for cgroups v2
- GH#7401: Column aliases used incorrectly in UNION subqueries
-- GH#7402: Privileges on merge table not propagated to partition tables
* Fri Sep 22 2023 Sjoerd Mullender - 11.47.7-20230925
- gdk: Fixed a number of data races (race conditions).
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Setting tag Jun2023_9 for the release build.
Changeset: a1e692de3637 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a1e692de3637 Modified Files: .hgtags Branch: Jun2023 Log Message: Setting tag Jun2023_9 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -810,3 +810,4 @@ 79dbf838f04483a2d9ccce8332090ff91b18caec 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7 +1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...
Changeset: 1efa83c64097 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1efa83c64097 Modified Files: MonetDB.spec debian/changelog misc/packages/deb/changelog misc/packages/rpm/changelog Branch: Jun2023 Log Message: Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and ChangeLog-Archive. diffs (83 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,13 +860,16 @@ fi %endif %changelog +* Wed Sep 27 2023 Sjoerd Mullender - 11.47.9-20230927 +- Rebuilt. +- GH#7402: Privileges on merge table not propagated to partition tables + * Mon Sep 25 2023 Sjoerd Mullender - 11.47.7-20230925 - Rebuilt. - GH#7094: Drop remote tables in transactions and rollback - GH#7303: Improve the performance of multi-column filters - GH#7400: VM max memory is not check correctly for cgroups v2 - GH#7401: Column aliases used incorrectly in UNION subqueries -- GH#7402: Privileges on merge table not propagated to partition tables * Fri Sep 22 2023 Sjoerd Mullender - 11.47.7-20230925 - gdk: Fixed a number of data races (race conditions). diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +monetdb (11.47.9) unstable; urgency=low + + * Rebuilt. + * GH#7402: Privileges on merge table not propagated to partition tables + + -- Sjoerd Mullender Wed, 27 Sep 2023 09:04:30 +0200 + monetdb (11.47.7) unstable; urgency=low * Rebuilt. @@ -5,7 +12,6 @@ monetdb (11.47.7) unstable; urgency=low * GH#7303: Improve the performance of multi-column filters * GH#7400: VM max memory is not check correctly for cgroups v2 * GH#7401: Column aliases used incorrectly in UNION subqueries - * GH#7402: Privileges on merge table not propagated to partition tables -- Sjoerd Mullender Mon, 25 Sep 2023 12:24:55 +0200 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,10 @@ +monetdb (11.47.9) unstable; urgency=low + + * Rebuilt. + * GH#7402: Privileges on merge table not propagated to partition tables + + -- Sjoerd Mullender Wed, 27 Sep 2023 09:04:30 +0200 + monetdb (11.47.7) unstable; urgency=low * Rebuilt. @@ -5,7 +12,6 @@ monetdb (11.47.7) unstable; urgency=low * GH#7303: Improve the performance of multi-column filters * GH#7400: VM max memory is not check correctly for cgroups v2 * GH#7401: Column aliases used incorrectly in UNION subqueries - * GH#7402: Privileges on merge table not propagated to partition tables -- Sjoerd Mullender Mon, 25 Sep 2023 12:24:55 +0200 diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,10 +1,13 @@ +* Wed Sep 27 2023 Sjoerd Mullender - 11.47.9-20230927 +- Rebuilt. +- GH#7402: Privileges on merge table not propagated to partition tables + * Mon Sep 25 2023 Sjoerd Mullender - 11.47.7-20230925 - Rebuilt. - GH#7094: Drop remote tables in transactions and rollback - GH#7303: Improve the performance of multi-column filters - GH#7400: VM max memory is not check correctly for cgroups v2 - GH#7401: Column aliases used incorrectly in UNION subqueries -- GH#7402: Privileges on merge table not propagated to partition tables * Fri Sep 22 2023 Sjoerd Mullender - 11.47.7-20230925 - gdk: Fixed a number of data races (race conditions). ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Updated library versions.
Changeset: c84f2273a0e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c84f2273a0e6
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:
Updated library versions.
diffs (10 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -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 "3")
+set(SQL_VERSION_PATCH "4")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Pre-release version number update.
Changeset: 765537bacd76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/765537bacd76
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Pre-release version number update.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.8
+current_version = 11.47.9
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.8
+%global version 11.47.9
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,8)
- PRODUCTVERSION version(11,47,8)
+ FILEVERSION version(11,47,9)
+ PRODUCTVERSION version(11,47,9)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,8)
+ VALUE "FileVersion", sversion(11,47,9)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,8)
+ VALUE "ProductVersion", sversion(11,47,9)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,8)
- PRODUCTVERSION version(11,47,8)
+ FILEVERSION version(11,47,9)
+ PRODUCTVERSION version(11,47,9)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,8)
+ VALUE "FileVersion", sversion(11,47,9)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,8)
+ VALUE "ProductVersion", sversion(11,47,9)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,8)
- PRODUCTVERSION version(11,47,8)
+ FILEVERSION version(11,47,9)
+ PRODUCTVERSION version(11,47,9)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,8)
+VALUE "FileVersion", sversion(11,47,9)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,8)
+VALUE "ProductVersion", sversion(11,47,9)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "8")
+set(MONETDB_VERSION_PATCH "9")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jun2023-SP2")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 4b7c09e5bee7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4b7c09e5bee7 Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with Jun2023 branch, not changing any files. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
