Changeset: 78c9f5b39bc6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/78c9f5b39bc6
Removed Files:
clients/Tests/exports.stable.out-noapprove
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/ChangeLog
gdk/libbat.rc
misc/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
tools/merovingian/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Jan2022".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Jan2022".
diffs (truncated from 370 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.42.0
+current_version = 11.44.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog.Jan2022
copy from ChangeLog
copy to ChangeLog.Jan2022
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.42.0
+%global version 11.44.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
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,10 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Wed Aug 11 2021 Sjoerd Mullender <[email protected]>
-- A new output formatting mode was added to mclient. Use -fcsv-noquote
- to produce a CSV (comma-separated values) output where the quote
- characters have not been escapes. This can be useful when producing
- a single column string output that should be saved as is, e.g. when
- using the sys.dump_database() function.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jan2022
copy from clients/ChangeLog
copy to clients/ChangeLog.Jan2022
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jan2022
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Jan2022
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,42,0)
- PRODUCTVERSION version(11,42,0)
+ FILEVERSION version(11,44,0)
+ PRODUCTVERSION version(11,44,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,42,0)
+ VALUE "FileVersion", sversion(11,44,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,42,0)
+ VALUE "ProductVersion", sversion(11,44,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Jan2022
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Jan2022
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,42,0)
- PRODUCTVERSION version(11,42,0)
+ FILEVERSION version(11,44,0)
+ PRODUCTVERSION version(11,44,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,42,0)
+ VALUE "FileVersion", sversion(11,44,0)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,42,0)
+ VALUE "ProductVersion", sversion(11,44,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,42,0)
- PRODUCTVERSION version(11,42,0)
+ FILEVERSION version(11,44,0)
+ PRODUCTVERSION version(11,44,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,42,0)
+ VALUE "FileVersion", sversion(11,44,0)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,42,0)
+ VALUE "ProductVersion", sversion(11,44,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 "42")
+set(MONETDB_VERSION_MINOR "44")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jan2022
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Jan2022
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,18 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Wed Aug 11 2021 Sjoerd Mullender <[email protected]>
-- Many (most) low level functions that could take a long time (such as
- BATjoin) can now be aborted with a timeout. When the function takes too
- long, the function will fail, and hence the whole SQL query will fail.
-- At some point in the past, string heaps were created where the
- hash value of the string was stored in the heap before the string.
- This hasn't been used in a long time. Now the code that could still
- read those old heaps has been removed. Bats that used the old format
- are converted automatically.
-
-* Mon Aug 2 2021 Sjoerd Mullender <[email protected]>
-- Some small interface changes to the atom functions: the atomPut function
- now returns (var_t) -1 on error instead of 0; the atomHeap function
- now returns success or failure as a gdk_return value.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Jan2022
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Jan2022
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,42,0)
- PRODUCTVERSION version(11,42,0)
+ FILEVERSION version(11,44,0)
+ PRODUCTVERSION version(11,44,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,42,0)
+ VALUE "FileVersion", sversion(11,44,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,42,0)
+ VALUE "ProductVersion", sversion(11,44,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Jan2022
copy from geom/ChangeLog
copy to geom/ChangeLog.Jan2022
diff --git a/misc/ChangeLog b/misc/ChangeLog
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,11 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Wed Aug 11 2021 Sjoerd Mullender <[email protected]>
-- Reliance on the OpenSSL library has been removed. OpenSSL was used
- for the hash algorithms it contained (e.g. SHA512 and RIPEMD160) and
- for producing random numbers. The hash functions have been replaced
- by the original published functions, and random numbers are generated
- using system-specific random sources (i.e. not simply pseudo-random
- number generators).
-
diff --git a/misc/ChangeLog b/misc/ChangeLog.Jan2022
copy from misc/ChangeLog
copy to misc/ChangeLog.Jan2022
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Jan2022
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Jan2022
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,42,0)
- PRODUCTVERSION version(11,42,0)
+ FILEVERSION version(11,44,0)
+ PRODUCTVERSION version(11,44,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,42,0)
+ VALUE "FileVersion", sversion(11,44,0)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,42,0)
+ VALUE "ProductVersion", sversion(11,44,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,62 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Tue Nov 9 2021 Pedro Ferreira <[email protected]>
-- The method to compute the 'side_effect' effect property was changed
- for SQL functions defined in the backend engine (eg. ``CREATE FUNCTION
- ... EXTERNAL NAME "module"."function"''). It was changed from being
- computed by the SQL layer to the backend engine itself. As a consequence,
- the computed 'side_effect' value may be different, thus bringing
- incompatibilities. After an upgrade, if a 'side_effect' incompatibility
- arises, either the 'side_effect' value in the backend should be changed or
- the function should be re-created in SQL.
-
-* Thu Nov 4 2021 Martin van Dinther <[email protected]>
-- Removed deprecated system view sys.systemfunctions. It was marked
- as deprecated from release Apr2019 (11.33.3). Use query:
- select id as function_id from sys.functions where system;
- to get the same data as the old view.
-
-* Thu Oct 21 2021 Martin van Dinther <[email protected]>
-- Extended SQL system catalog with lookup table sys.fkey_actions and
- view sys.fkeys to provide user friendly querying of existing foreign
- keys and their ON UPDATE and ON DELETE referential action specifications.
-
-* Tue Oct 12 2021 Pedro Ferreira <[email protected]>
-- Many improvements were done for REMOTE table plans. As a consequence,
- master or slave servers from this feature release are not compatible
- with older releases.
-
-* Tue Sep 7 2021 Sjoerd Mullender <[email protected]>
-- The view sys.ids has been changed to give more information about the
- objects in the system. In particular, there is an extra column
- added at the end that indicates whether the object is a system
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
