Changeset: 6b584808b1a9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b584808b1a9
Removed Files:
clients/Tests/exports.stable.out-noapprove
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
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Oct2020".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Oct2020".
diffs (truncated from 341 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.38.0
+current_version = 11.40.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
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Wed Jun 10 2020 Sjoerd Mullender <[email protected]>
-- Removed support for LiDAR data, that is the SQL procedures
- sys.lidarattach, sys.lidarload, and sys.lidarexport.
-
-* Thu Apr 2 2020 Martin Kersten <[email protected]>
-- The sys.queue() has been turned into a circular buffer to allow for
- inspection of both active, paused and recently executed queries.
-
diff --git a/ChangeLog b/ChangeLog.Oct2020
copy from ChangeLog
copy 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.40.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
copy from clients/ChangeLog
copy to clients/ChangeLog.Oct2020
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Oct2020
copy from clients/mapilib/ChangeLog
copy 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,40,0)
+ PRODUCTVERSION version(11,40,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,40,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,40,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,40,0)
+ PRODUCTVERSION version(11,40,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,40,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,40,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,40,0)
+ PRODUCTVERSION version(11,40,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,40,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,40,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 "40")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Oct2020
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Oct2020
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Oct2020
copy from gdk/ChangeLog
copy 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,40,0)
+ PRODUCTVERSION version(11,40,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,40,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,40,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Oct2020
copy from geom/ChangeLog
copy to geom/ChangeLog.Oct2020
diff --git a/misc/ChangeLog b/misc/ChangeLog.Oct2020
copy from misc/ChangeLog
copy to misc/ChangeLog.Oct2020
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,16 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Thu Aug 20 2020 Sjoerd Mullender <[email protected]>
-- The settings for specifying how mserver5 should listen to "The
- Internet" have been overhauled. See the manual for details. In
- brief, mapi_autosense, mapi_ipv6 and mapi_open are gone. If
- mapi_listenaddr equals "localhost" or "all", we listen to both IPv4
- and IPv6 (if available), if "127.0.0.1" or "0.0.0.0", we listen to
- IPv4 only, if "::1" or "::" we listen to IPv6 only. The first of
- each pair is loopback interface only, the second is all interfaces.
- If mapi_listenaddr is "none", then no IP port is opened, you need to
- use a UNIX domain socket. If mapi_port is 0, we let the operating
- system choose a free port (like mapi_autosense). Default behavior
- has not changed.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Oct2020
copy from monetdb5/ChangeLog
copy 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,40,0)
+ PRODUCTVERSION version(11,40,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,40,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,40,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,58 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Thu Apr 2 2020 Martin Kersten <[email protected]>
-- Extended the system monitor with a table-returning function
- user_statistics() which keeps some statistics for each SQL user, e.g. the
- user's query count, total time spent, and maximal query seen.
-
-* Tue Jun 2 2020 Pedro Ferreira <[email protected]>
-- Removed '@' syntax used to refer into a variable in a query. It
- was a non-standard method, which was replaced by a schema addition to
- variables. Variables in the global scope now have schema. All default
- global variables are set under schema "sys". However variables
- inside PSM don't have a schema, because there are no transaction
- semantics inside PSM at the moment.
-- Removed declared variables and tables from the global scope. They were
- transaction agnostic and incompatible with the SQL standard, i.e. they
- are valid exclusively under PSM (e.g. functions, procedures and
- triggers).
-- Scoping semantics were added for both variables and tables. Variables
- with the same name at a query are now resolved under the following
- precedence rules:
- 1. Tables, Views and CTEs at the FROM clause.
- 2. Variable declared in the body of function/procedure, i.e. local
- variable.
- 3. Function/procedure parameter.
- 4. Variable from the global scope.
- Tables with the same name now have the following precedence rules at a
- SQL query:
- 1. Table declared in the body of function/procedure, ie local table.
- 2. Temporary table.
- 3. Table from the current session schema.
- This means the query: SELECT * FROM "keys"; will list keys from
- temporary tables instead of persisted ones, because "keys" table
- is available for both "sys" and "tmp" schemas.
-- The table returning function "var" was extended with more details
- about globally declared variables, namely their schema, type and
- current value.
-
-* Mon Jun 15 2020 Pedro Ferreira <[email protected]>
-- Removed obsolete sys.getContent(url) function.
-
-* Tue Jun 16 2020 Pedro Ferreira <[email protected]>
-- Removed obsolete json.output(json) function.
-
-* Tue Jun 30 2020 Pedro Ferreira <[email protected]>
-- Removed compability between interval types and other numeric types in
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
