Changeset: 8737a9590680 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/8737a9590680 Added Files: ChangeLog.Dec2023 clients/ChangeLog.Dec2023 clients/mapilib/ChangeLog.Dec2023 clients/odbc/ChangeLog.Dec2023 common/stream/ChangeLog.Dec2023 gdk/ChangeLog.Dec2023 geom/ChangeLog.Dec2023 misc/ChangeLog.Dec2023 monetdb5/ChangeLog.Dec2023 sql/ChangeLog.Dec2023 testing/ChangeLog.Dec2023 tools/merovingian/ChangeLog.Dec2023 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 gdk/libbat.rc monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_upgrades.c Branch: Dec2023 Log Message:
Step one towards a new stable branch "Dec2023". Incremented version numbers. Moved ChangeLog file to ChangeLog.Dec2023. The root of the stable branch is "Dec2023_root". diffs (259 lines): diff --git a/.bumpversion.cfg b/.bumpversion.cfg --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 11.48.0 +current_version = 11.49.0 commit = False tag = False diff --git a/ChangeLog b/ChangeLog.Dec2023 rename from ChangeLog rename to ChangeLog.Dec2023 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.48.0 +%global version 11.49.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # Use bcond_with to add a --with option; i.e., "without" is default. diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2023 rename from clients/ChangeLog rename to clients/ChangeLog.Dec2023 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Dec2023 rename from clients/mapilib/ChangeLog rename to clients/mapilib/ChangeLog.Dec2023 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,48,0) - PRODUCTVERSION version(11,48,0) + FILEVERSION version(11,49,0) + PRODUCTVERSION version(11,49,0) 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,48,0) + VALUE "FileVersion", sversion(11,49,0) 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,48,0) + VALUE "ProductVersion", sversion(11,49,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Dec2023 rename from clients/odbc/ChangeLog rename to clients/odbc/ChangeLog.Dec2023 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,48,0) - PRODUCTVERSION version(11,48,0) + FILEVERSION version(11,49,0) + PRODUCTVERSION version(11,49,0) 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,48,0) + VALUE "FileVersion", sversion(11,49,0) 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,48,0) + VALUE "ProductVersion", sversion(11,49,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 @@ -65,8 +65,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION version(11,48,0) - PRODUCTVERSION version(11,48,0) + FILEVERSION version(11,49,0) + PRODUCTVERSION version(11,49,0) 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,48,0) + VALUE "FileVersion", sversion(11,49,0) 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,48,0) + VALUE "ProductVersion", sversion(11,49,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 @@ -9,7 +9,7 @@ #]] set(MONETDB_VERSION_MAJOR "11") -set(MONETDB_VERSION_MINOR "48") +set(MONETDB_VERSION_MINOR "49") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Dec2023 rename from common/stream/ChangeLog rename to common/stream/ChangeLog.Dec2023 diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Dec2023 rename from gdk/ChangeLog rename to gdk/ChangeLog.Dec2023 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,48,0) - PRODUCTVERSION version(11,48,0) + FILEVERSION version(11,49,0) + PRODUCTVERSION version(11,49,0) 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 Goblin Database Kernel DLL\0" - VALUE "FileVersion", sversion(11,48,0) + VALUE "FileVersion", sversion(11,49,0) VALUE "InternalName", "libbat\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", sversion(11,48,0) + VALUE "ProductVersion", sversion(11,49,0) VALUE "SpecialBuild", "\0" END END diff --git a/geom/ChangeLog b/geom/ChangeLog.Dec2023 rename from geom/ChangeLog rename to geom/ChangeLog.Dec2023 diff --git a/misc/ChangeLog b/misc/ChangeLog.Dec2023 rename from misc/ChangeLog rename to misc/ChangeLog.Dec2023 diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Dec2023 rename from monetdb5/ChangeLog rename to monetdb5/ChangeLog.Dec2023 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,48,0) - PRODUCTVERSION version(11,48,0) + FILEVERSION version(11,49,0) + PRODUCTVERSION version(11,49,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB5 Library DLL\0" - VALUE "FileVersion", sversion(11,48,0) + VALUE "FileVersion", sversion(11,49,0) VALUE "InternalName", "libmonetdb5\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libmonetdb5.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", sversion(11,48,0) + VALUE "ProductVersion", sversion(11,49,0) VALUE "SpecialBuild", "\0" END END diff --git a/sql/ChangeLog b/sql/ChangeLog.Dec2023 rename from sql/ChangeLog rename to sql/ChangeLog.Dec2023 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 @@ -5813,7 +5813,7 @@ sql_update_jun2023_sp3(Client c, mvc *sq } static str -sql_update_default_geom(Client c, mvc *sql, sql_schema *s) +sql_update_dec2023_geom(Client c, mvc *sql, sql_schema *s) { sql_subtype tp; char *err = NULL; @@ -5902,7 +5902,7 @@ sql_update_default_geom(Client c, mvc *s } static str -sql_update_default(Client c, mvc *sql, sql_schema *s) +sql_update_dec2023(Client c, mvc *sql, sql_schema *s) { sql_subtype tp; sql_schema *info; @@ -6651,12 +6651,12 @@ SQLupgrades(Client c, mvc *m) goto handle_error; } - if ((err = sql_update_default_geom(c, m, s)) != NULL) { + if ((err = sql_update_dec2023_geom(c, m, s)) != NULL) { TRC_CRITICAL(SQL_PARSER, "%s\n", err); goto handle_error; } - if ((err = sql_update_default(c, m, s)) != NULL) { + if ((err = sql_update_dec2023(c, m, s)) != NULL) { TRC_CRITICAL(SQL_PARSER, "%s\n", err); goto handle_error; } diff --git a/testing/ChangeLog b/testing/ChangeLog.Dec2023 rename from testing/ChangeLog rename to testing/ChangeLog.Dec2023 diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog.Dec2023 rename from tools/merovingian/ChangeLog rename to tools/merovingian/ChangeLog.Dec2023 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org