Changeset: f03ffab9a2f5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f03ffab9a2f5 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/ChangeLog gdk/libbat.rc monetdb5/ChangeLog monetdb5/tools/libmonetdb5.rc sql/ChangeLog tools/merovingian/ChangeLog Branch: default Log Message:
Step two towards a new stable branch "Jul2021". Increment version numbers. >From now on, *all* bug fixes, and *only* bug fixes, *must* go to the stable branch with the name "Jul2021". diffs (truncated from 368 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.40.0 +current_version = 11.42.0 commit = False tag = False diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu Apr 15 2021 svetlin <[email protected]> -- preserve in query comments - diff --git a/ChangeLog b/ChangeLog.Jul2021 copy from ChangeLog copy to ChangeLog.Jul2021 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %global name MonetDB -%global version 11.40.0 +%global version 11.42.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.Jul2021 copy from clients/ChangeLog copy to clients/ChangeLog.Jul2021 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jul2021 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Jul2021 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,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,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,40,0) + VALUE "FileVersion", sversion(11,42,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,40,0) + VALUE "ProductVersion", sversion(11,42,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Jul2021 copy from clients/odbc/ChangeLog copy to clients/odbc/ChangeLog.Jul2021 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,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,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,40,0) + VALUE "FileVersion", sversion(11,42,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,40,0) + VALUE "ProductVersion", sversion(11,42,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,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,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,40,0) + VALUE "FileVersion", sversion(11,42,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,40,0) + VALUE "ProductVersion", sversion(11,42,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 "40") +set(MONETDB_VERSION_MINOR "42") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jul2021 copy from common/stream/ChangeLog copy to common/stream/ChangeLog.Jul2021 diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,33 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Mon Mar 29 2021 Sjoerd Mullender <[email protected]> -- Implemented function BUNreplacemultiincr to replace multiple values - in a BAT in one go, starting at a given position. -- Implemented new function BUNreplacemulti to replace multiple values - in a BAT in one go, at the given positions. -- Removed function BUNinplace, just use BUNreplace, and check whether - the BAT argument is of type TYPE_void before calling if you don't - want to materialize. - -* Mon Mar 15 2021 Sjoerd Mullender <[email protected]> -- Implemented a function BUNappendmulti which appends an array of values - to a BAT. It is a generalization of the function BUNappend. - -* Thu Feb 25 2021 Sjoerd Mullender <[email protected]> -- Changed the interface of the atom read function. It now requires an - extra pointer to a size_t value that gives the current size of the - destination buffer, and when that buffer is too small, it receives the - size of the reallocated buffer that is large enough. In any case, - and as before, the return value is a pointer to the destination buffer. - -* Fri Jan 29 2021 Sjoerd Mullender <[email protected]> -- Environment variables (sys.env()) must be UTF-8, but since they can - contain file names which may not be UTF-8, there is now a mechanism - to store the original values outside of sys.env() and store - %-escaped (similar to URL escaping) values in the environment. The - key must still be UTF-8. - -* Tue Dec 1 2020 Sjoerd Mullender <[email protected]> -- We now save the location of the min and max values when known. - diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Jul2021 copy from gdk/ChangeLog copy to gdk/ChangeLog.Jul2021 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,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,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,40,0) + VALUE "FileVersion", sversion(11,42,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,40,0) + VALUE "ProductVersion", sversion(11,42,0) VALUE "SpecialBuild", "\0" END END diff --git a/geom/ChangeLog b/geom/ChangeLog.Jul2021 copy from geom/ChangeLog copy to geom/ChangeLog.Jul2021 diff --git a/misc/ChangeLog b/misc/ChangeLog.Jul2021 copy from misc/ChangeLog copy to misc/ChangeLog.Jul2021 diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog --- a/monetdb5/ChangeLog +++ b/monetdb5/ChangeLog @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Wed Sep 9 2020 Sjoerd Mullender <[email protected]> -- By using the option "--dbextra=:memory:", mserver5 can be instructed - to keep transient BATs completely in memory. - diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Jul2021 copy from monetdb5/ChangeLog copy to monetdb5/ChangeLog.Jul2021 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,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,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,40,0) + VALUE "FileVersion", sversion(11,42,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,40,0) + VALUE "ProductVersion", sversion(11,42,0) VALUE "SpecialBuild", "\0" END END diff --git a/sql/ChangeLog b/sql/ChangeLog --- a/sql/ChangeLog +++ b/sql/ChangeLog @@ -1,45 +1,3 @@ # ChangeLog file for sql # This file is updated with Maddlog -* Wed Apr 28 2021 Pedro Ferreira <[email protected]> -- Merge statements could not produce correct results on complex join - conditions, so a renovation was made. As a consequence, subqueries - now have to be disabled on merge join conditions. - -* Tue Mar 16 2021 Pedro Ferreira <[email protected]> -- Use of CTEs inside UPDATE and DELETE statements are now more - restrict. Previously they could be used without any extra specification - in the query (eg. with "v1"("c1") as (...) delete from "t" - where "t"."c1" = "v1"."c1"), however this was not conformant with the - SQL standard. In order to use them, they must be specified in the FROM - clause in UPDATE statments or inside a subquery. - -* Mon Nov 30 2020 Pedro Ferreira <[email protected]> -- Added 'schema path' property to user, specifying a list of schemas - to be searched on to find SQL objects such as tables and - functions. The scoping rules have been updated to support this feature - and it now finds SQL objects in the following order: - 1. On occasions with multiple tables (e.g. add foreign key constraint, - add table to a merge table), the child will be searched on the - parent's schema. - 2. For tables only, declared tables on the stack. - 3. 'tmp' schema if not listed on the 'schema path'. _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
