Changeset: 309270e31694 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=309270e31694
Added Files:
ChangeLog.Oct2020
clients/ChangeLog.Oct2020
clients/Tests/exports.stable.out-noapprove
clients/mapilib/ChangeLog.Oct2020
common/stream/ChangeLog.Oct2020
gdk/ChangeLog.Oct2020
geom/ChangeLog.Oct2020
misc/ChangeLog.Oct2020
monetdb5/ChangeLog.Oct2020
sql/ChangeLog.Oct2020
testing/ChangeLog.Oct2020
tools/merovingian/ChangeLog.Oct2020
Removed Files:
ChangeLog
clients/ChangeLog
clients/mapilib/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: Oct2020
Log Message:
Step one towards a new stable branch "Oct2020".
Incremented version numbers.
Moved ChangeLog file to ChangeLog.Oct2020.
The root of the stable branch is "Oct2020_root".
diffs (246 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.38.0
+current_version = 11.39.0
commit = False
tag = False
@@ -30,3 +30,4 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
+
diff --git a/ChangeLog b/ChangeLog.Oct2020
rename from ChangeLog
rename to ChangeLog.Oct2020
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.38.0
+%global version 11.39.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.Oct2020
rename from clients/ChangeLog
rename to clients/ChangeLog.Oct2020
diff --git a/clients/Tests/exports.stable.out-noapprove
b/clients/Tests/exports.stable.out-noapprove
new file mode 100644
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Oct2020
rename from clients/mapilib/ChangeLog
rename to clients/mapilib/ChangeLog.Oct2020
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,38,0)
- PRODUCTVERSION version(11,38,0)
+ FILEVERSION version(11,39,0)
+ PRODUCTVERSION version(11,39,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,38,0)
+ VALUE "FileVersion", sversion(11,39,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,38,0)
+ VALUE "ProductVersion", sversion(11,39,0)
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,38,0)
- PRODUCTVERSION version(11,38,0)
+ FILEVERSION version(11,39,0)
+ PRODUCTVERSION version(11,39,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,38,0)
+ VALUE "FileVersion", sversion(11,39,0)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,38,0)
+ VALUE "ProductVersion", sversion(11,39,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,38,0)
- PRODUCTVERSION version(11,38,0)
+ FILEVERSION version(11,39,0)
+ PRODUCTVERSION version(11,39,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,38,0)
+ VALUE "FileVersion", sversion(11,39,0)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,38,0)
+ VALUE "ProductVersion", sversion(11,39,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
@@ -7,7 +7,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "38")
+set(MONETDB_VERSION_MINOR "39")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Oct2020
rename from common/stream/ChangeLog
rename to common/stream/ChangeLog.Oct2020
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Oct2020
rename from gdk/ChangeLog
rename to gdk/ChangeLog.Oct2020
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,38,0)
- PRODUCTVERSION version(11,38,0)
+ FILEVERSION version(11,39,0)
+ PRODUCTVERSION version(11,39,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,38,0)
+ VALUE "FileVersion", sversion(11,39,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,38,0)
+ VALUE "ProductVersion", sversion(11,39,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Oct2020
rename from geom/ChangeLog
rename to geom/ChangeLog.Oct2020
diff --git a/misc/ChangeLog b/misc/ChangeLog.Oct2020
rename from misc/ChangeLog
rename to misc/ChangeLog.Oct2020
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Oct2020
rename from monetdb5/ChangeLog
rename to monetdb5/ChangeLog.Oct2020
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,38,0)
- PRODUCTVERSION version(11,38,0)
+ FILEVERSION version(11,39,0)
+ PRODUCTVERSION version(11,39,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,38,0)
+ VALUE "FileVersion", sversion(11,39,0)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,38,0)
+ VALUE "ProductVersion", sversion(11,39,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog.Oct2020
rename from sql/ChangeLog
rename to sql/ChangeLog.Oct2020
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
@@ -2331,7 +2331,7 @@ sql_update_oscar(Client c, mvc *sql, con
}
static str
-sql_update_default(Client c, mvc *sql, const char *prev_schema, bool
*systabfixed)
+sql_update_oct2020(Client c, mvc *sql, const char *prev_schema, bool
*systabfixed)
{
size_t bufsize = 3000, pos = 0;
char *buf, *err;
@@ -2647,7 +2647,7 @@ SQLupgrades(Client c, mvc *m)
return -1;
}
- if ((err = sql_update_default(c, m, prev_schema, &systabfixed)) !=
NULL) {
+ if ((err = sql_update_oct2020(c, m, prev_schema, &systabfixed)) !=
NULL) {
TRC_CRITICAL(SQL_PARSER, "%s\n", err);
freeException(err);
GDKfree(prev_schema);
diff --git a/testing/ChangeLog b/testing/ChangeLog.Oct2020
rename from testing/ChangeLog
rename to testing/ChangeLog.Oct2020
diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog.Oct2020
rename from tools/merovingian/ChangeLog
rename to tools/merovingian/ChangeLog.Oct2020
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
