Changeset: ad984ac4cabb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ad984ac4cabb
Modified Files:
.bumpversion.cfg
ChangeLog
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
debian/control
gdk/ChangeLog
gdk/libbat.rc
geom/ChangeLog
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Mar2025".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Mar2025".
diffs (truncated from 359 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.52.0
+current_version = 11.54.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Sep 16 2024 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>
-- Hot snapshot: allow member files larger than 64 GiB. By member files we mean
- the files inside the resulting .tar file, not the tar file itself. Huge
member
- files are written using a GNU tar extension to the original tar format, which
- doesn't support more than 8 GiB.
-
diff --git a/ChangeLog b/ChangeLog.Mar2025
copy from ChangeLog
copy to ChangeLog.Mar2025
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -8,7 +8,7 @@
# Copyright August 2008 - 2023 MonetDB B.V.;
# Copyright 1997 - July 2008 CWI.
-%global version 11.52.0
+%global version 11.54.0
%bcond_with compat
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2025
copy from clients/ChangeLog
copy to clients/ChangeLog.Mar2025
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Mar2025
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Mar2025
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,52,0)
- PRODUCTVERSION version(11,52,0)
+ FILEVERSION version(11,54,0)
+ PRODUCTVERSION version(11,54,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,52,0)
+ VALUE "FileVersion", sversion(11,54,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,52,0)
+ VALUE "ProductVersion", sversion(11,54,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Mar2025
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Mar2025
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,52,0)
- PRODUCTVERSION version(11,52,0)
+ FILEVERSION version(11,54,0)
+ PRODUCTVERSION version(11,54,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,52,0)
+ VALUE "FileVersion", sversion(11,54,0)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB ODBC Driver\0"
- VALUE "ProductVersion", sversion(11,52,0)
+ VALUE "ProductVersion", sversion(11,54,0)
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
@@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,52,0)
- PRODUCTVERSION version(11,52,0)
+ FILEVERSION version(11,54,0)
+ PRODUCTVERSION version(11,54,0)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", sversion(11,52,0)
+ VALUE "FileVersion", sversion(11,54,0)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB
Foundation"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB ODBC Setup"
- VALUE "ProductVersion", sversion(11,52,0)
+ VALUE "ProductVersion", sversion(11,54,0)
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
@@ -11,7 +11,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "52")
+set(MONETDB_VERSION_MINOR "54")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Mar2025
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Mar2025
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,8 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Fri Sep 13 2024 Sjoerd Mullender <sjo...@acm.org>
-- The implementation for the imprints index on numeric columns has
- been removed. It hasn't been used in years, and when it is enabled,
- it doesn't really make queries go faster.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Mar2025
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Mar2025
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.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,52,0)
- PRODUCTVERSION version(11,52,0)
+ FILEVERSION version(11,54,0)
+ PRODUCTVERSION version(11,54,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,52,0)
+ VALUE "FileVersion", sversion(11,54,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,52,0)
+ VALUE "ProductVersion", sversion(11,54,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog
--- a/geom/ChangeLog
+++ b/geom/ChangeLog
@@ -1,7 +1,3 @@
# ChangeLog file for geom
# This file is updated with Maddlog
-* Tue Nov 26 2024 Sjoerd Mullender <sjo...@acm.org>
-- Removed type geometryA (geometry array). It was deprecated in the
- Jun2023 release (11.47.X) because there was no use for the type.
-
diff --git a/geom/ChangeLog b/geom/ChangeLog.Mar2025
copy from geom/ChangeLog
copy to geom/ChangeLog.Mar2025
diff --git a/misc/ChangeLog b/misc/ChangeLog.Mar2025
copy from misc/ChangeLog
copy to misc/ChangeLog.Mar2025
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,12 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Mon Jan 13 2025 Sjoerd Mullender <sjo...@acm.org>
-- Removed function bat.attach since it wasn't used.
-
-* Fri Nov 22 2024 Sjoerd Mullender <sjo...@acm.org>
-- Removed the MAL type "identifier" and supporting functions. There has
- never been an SQL interface to this type.
-- Removed the MAL type "color" and supporting functions. There has
- never been an SQL interface to this type.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Mar2025
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Mar2025
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.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,52,0)
- PRODUCTVERSION version(11,52,0)
+ FILEVERSION version(11,54,0)
+ PRODUCTVERSION version(11,54,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
- VALUE "FileVersion", sversion(11,52,0)
+ VALUE "FileVersion", sversion(11,54,0)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,52,0)
+ VALUE "ProductVersion", sversion(11,54,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,44 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Mon Feb 10 2025 stefanos mavros <stemav...@gmail.com>
-- Extended the constant aggregate optimizer in order to eliminate
- aggregates with constant arguments whenever possible.
-
-* Fri Dec 20 2024 Niels Nes <ni...@cwi.nl>
-- Added support for aggregates which order within the group such
- as quantile and which potentially order within the group such as
- group_concat. The ordering for such operators in now handled once in
- the relational plan. For this the create function statements can now
- have an optional order specification, using the keywords 'ORDERED'
- and 'WITH ORDER'.
-
-* Fri Dec 20 2024 Sjoerd Mullender <sjo...@acm.org>
-- Added support for recursive CTE's.
-- The SQL parser was cleaned up. This resulted in some keywords being
- used more strictly. If any of these keywords are to be used as column
- names, they have to be quoted using double quotes: AS, TABLE, COLUMN,
- DISTINCT, EXEC, EXECUTE.
-
-* Tue Oct 8 2024 Yunus Koning <yunus.kon...@monetdbsolutions.com>
-- Introduce the RETURNING clause for INSERT, UPDATE and DELETE statements.
- Specifying a RETURNING clause causes the SQL statement to return the
- modified records which can be queried using SELECT like expressions
- in the RETURNING clause. Aggregate functions are allowed.
- This is a common non-standard SQL extension.
-
- Examples:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
