Changeset: 6497a5bc3736 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6497a5bc3736
Added Files:
ChangeLog.Mar2025
clients/ChangeLog.Mar2025
clients/mapilib/ChangeLog.Mar2025
clients/odbc/ChangeLog.Mar2025
common/stream/ChangeLog.Mar2025
gdk/ChangeLog.Mar2025
geom/ChangeLog.Mar2025
misc/ChangeLog.Mar2025
monetdb5/ChangeLog.Mar2025
sql/ChangeLog.Mar2025
testing/ChangeLog.Mar2025
tools/merovingian/ChangeLog.Mar2025
Removed Files:
ChangeLog
clients/ChangeLog
clients/mapilib/ChangeLog
clients/odbc/ChangeLog
common/stream/ChangeLog
gdk/ChangeLog
geom/ChangeLog
misc/ChangeLog
monetdb5/ChangeLog
sql/ChangeLog
testing/ChangeLog
tools/merovingian/ChangeLog
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
debian/control
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_upgrades.c
Branch: Mar2025
Log Message:
Step one towards a new stable branch "Mar2025".
Incremented version numbers.
Moved ChangeLog file to ChangeLog.Mar2025.
The root of the stable branch is "Mar2025_root".
diffs (271 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.53.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog.Mar2025
rename from ChangeLog
rename 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.53.0
%bcond_with compat
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2025
rename from clients/ChangeLog
rename to clients/ChangeLog.Mar2025
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Mar2025
rename from clients/mapilib/ChangeLog
rename 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,53,0)
+ PRODUCTVERSION version(11,53,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,53,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,53,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Mar2025
rename from clients/odbc/ChangeLog
rename 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,53,0)
+ PRODUCTVERSION version(11,53,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,53,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,53,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,53,0)
+ PRODUCTVERSION version(11,53,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,53,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,53,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 "53")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Mar2025
rename from common/stream/ChangeLog
rename to common/stream/ChangeLog.Mar2025
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: MonetDB Foundation <i...@monetdb.org>
Homepage: https://www.monetdb.org/
Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/
-Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b default
+Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b Mar2025
Build-Depends: debhelper-compat (= 12), cmake (>= 3.12), bison,
libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.10.0),
libpcre3-dev, libreadline-dev, liblzma-dev, liblz4-dev (>= 1.8.0),
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Mar2025
rename from gdk/ChangeLog
rename 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,53,0)
+ PRODUCTVERSION version(11,53,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,53,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,53,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Mar2025
rename from geom/ChangeLog
rename to geom/ChangeLog.Mar2025
diff --git a/misc/ChangeLog b/misc/ChangeLog.Mar2025
rename from misc/ChangeLog
rename to misc/ChangeLog.Mar2025
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Mar2025
rename from monetdb5/ChangeLog
rename 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,53,0)
+ PRODUCTVERSION version(11,53,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,53,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,53,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog.Mar2025
rename from sql/ChangeLog
rename to sql/ChangeLog.Mar2025
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -4369,7 +4369,7 @@ sql_update_aug2024(Client c, mvc *sql, s
}
static str
-sql_update_default_geom(Client c, mvc *sql, sql_schema *s)
+sql_update_mar2025_geom(Client c, mvc *sql, sql_schema *s)
{
str err;
res_table *output = NULL;
@@ -4407,7 +4407,7 @@ sql_update_default_geom(Client c, mvc *s
}
static str
-sql_update_default(Client c, mvc *sql, sql_schema *s)
+sql_update_mar2025(Client c, mvc *sql, sql_schema *s)
{
char *err = MAL_SUCCEED;
sql_subtype tp;
@@ -4813,12 +4813,12 @@ SQLupgrades(Client c, mvc *m)
goto handle_error;
}
- if ((err = sql_update_default(c, m, s)) != NULL) {
+ if ((err = sql_update_mar2025(c, m, s)) != NULL) {
TRC_CRITICAL(SQL_PARSER, "%s\n", err);
goto handle_error;
}
- if ((err = sql_update_default_geom(c, m, s)) != NULL) {
+ if ((err = sql_update_mar2025_geom(c, m, s)) != NULL) {
TRC_CRITICAL(SQL_PARSER, "%s\n", err);
goto handle_error;
}
diff --git a/testing/ChangeLog b/testing/ChangeLog.Mar2025
rename from testing/ChangeLog
rename to testing/ChangeLog.Mar2025
diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog.Mar2025
rename from tools/merovingian/ChangeLog
rename to tools/merovingian/ChangeLog.Mar2025
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
