Changeset: 65c08f02fb89 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65c08f02fb89 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/mapilib/ChangeLog.Aug2018 common/stream/ChangeLog.Aug2018 gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 testing/ChangeLog.Aug2018 tools/merovingian/ChangeLog.Aug2018 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog clients/ChangeLog clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/ChangeLog configure.ag gdk/ChangeLog gdk/libbat.rc monetdb5/ChangeLog monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/sql_upgrades.c testing/ChangeLog tools/merovingian/ChangeLog vertoo.data Branch: default Log Message:
Step two towards a new stable branch "Aug2018". Increment version numbers. >From now on, *all* bug fixes, and *only* bug fixes, *must* go to the stable branch with the name "Aug2018". diffs (truncated from 446 to 300 lines): diff --git a/ChangeLog b/ChangeLog.Aug2018 copy from ChangeLog copy to ChangeLog.Aug2018 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.30.0 +%define version 11.32.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -666,7 +666,7 @@ #define PACKAGE_URL "https://www.monetdb.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.30.0" +#define PACKAGE_VERSION "11.32.0" /* Path separator */ #define PATH_SEP ';' diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -6,7 +6,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. -VERSION=11.30.0 +VERSION=11.32.0 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog --- a/buildtools/ChangeLog +++ b/buildtools/ChangeLog @@ -1,8 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Wed May 16 2018 Sjoerd Mullender <sjo...@acm.org> -- On Windows, the separate MonetDB5-Geom installer has been incorporated - into the main MonetDB5-SQL installer and is therefore no longer - available as a separate download. - diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Aug2018 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Aug2018 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Fri May 25 2018 Ying Zhang <y.zh...@cwi.nl> -- Added a '-f rowcount' option in mclient to repress printing the actual - data of a resultset, but only print the number of returned tuples - diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2018 copy from clients/ChangeLog copy to clients/ChangeLog.Aug2018 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Aug2018 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Aug2018 diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,32,0,1 + PRODUCTVERSION 11,32,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. 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 @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,32,0,1 + PRODUCTVERSION 11,32,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libMonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. 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 @@ -62,8 +62,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,32,0,1 + PRODUCTVERSION 11,32,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,12 +80,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB B.V." VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", "11.30.0" + VALUE "FileVersion", "11.32.0" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.30.0" + VALUE "ProductVersion", "11.32.0" END END BLOCK "VarFileInfo" diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog --- a/common/stream/ChangeLog +++ b/common/stream/ChangeLog @@ -1,6 +1,3 @@ # ChangeLog file for stream # This file is updated with Maddlog -* Tue Feb 13 2018 Pedro Ferreira <pedro.ferre...@monetdbsolutions.com> -- Added support for lz4 compressed files in the stream library - diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Aug2018 copy from common/stream/ChangeLog copy to common/stream/ChangeLog.Aug2018 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -46,7 +46,7 @@ dnl configure file, whereas comments st dnl (including their trailing newline). AC_PREREQ([2.63]) -AC_INIT([MonetDB], [11.30.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.32.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,25 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Mon Jul 30 2018 Sjoerd Mullender <sjo...@acm.org> -- The macros bunfastapp and tfastins and variants no longer set the dirty - flag of the heap they write to. This now needs to be done separately - (and preferably outside of the inner loop). - -* Fri Jul 27 2018 Sjoerd Mullender <sjo...@acm.org> -- Removed batDirty flag from BAT record. Its function is completely - superseded by batDirtydesc and the dirty flags on the various heaps. - -* Tue Jul 24 2018 Sjoerd Mullender <sjo...@acm.org> -- Removed "masksize" argument of function BAThash. - -* Tue May 29 2018 Sjoerd Mullender <sjo...@acm.org> -- A whole bunch of functions that took an int argument that was used as a - Boolean (true/false) value now take a value of type bool. The functions - BATkeyed, BATordered and BATordered_rev now return a bool instead of - an int. - -* Tue Mar 20 2018 Sjoerd Mullender <sjo...@acm.org> -- Removed the tdense property: it's function is completely replaced by - whether or not tseqbase is equal to oid_nil. - diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Aug2018 copy from gdk/ChangeLog copy to gdk/ChangeLog.Aug2018 diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,32,0,1 + PRODUCTVERSION 11,32,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/geom/ChangeLog b/geom/ChangeLog.Aug2018 copy from geom/ChangeLog copy to geom/ChangeLog.Aug2018 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 -* Fri May 25 2018 Sjoerd Mullender <sjo...@acm.org> -- The lsst module was moved to a separate repository - (https://dev.monetdb.org/hg/MonetDB-lsst/). - diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Aug2018 copy from monetdb5/ChangeLog copy to monetdb5/ChangeLog.Aug2018 diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc --- a/monetdb5/tools/libmonetdb5.rc +++ b/monetdb5/tools/libmonetdb5.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,32,0,1 + PRODUCTVERSION 11,32,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB5 Library DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libmonetdb5.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.32.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list