Changeset: 9868c8c38b87 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9868c8c38b87
Added Files:
        ChangeLog.Nov2019
        buildtools/ChangeLog.Nov2019
        clients/ChangeLog.Nov2019
        clients/mapilib/ChangeLog.Nov2019
        common/stream/ChangeLog.Nov2019
        gdk/ChangeLog.Nov2019
        geom/ChangeLog.Nov2019
        monetdb5/ChangeLog.Nov2019
        sql/ChangeLog.Nov2019
        testing/ChangeLog.Nov2019
        tools/merovingian/ChangeLog.Nov2019
Modified Files:
        MonetDB.spec
        NT/monetdb_config.h.in
        NT/rules.msc
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        configure.ag
        gdk/ChangeLog
        gdk/libbat.rc
        monetdb5/ChangeLog
        monetdb5/tools/libmonetdb5.rc
        sql/ChangeLog
        sql/backends/monet5/sql_upgrades.c
        tools/merovingian/ChangeLog
        vertoo.data
Branch: default
Log Message:

Step two towards a new stable branch "Nov2019".

Increment version numbers.

>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Nov2019".


diffs (truncated from 364 to 300 lines):

diff --git a/ChangeLog b/ChangeLog.Nov2019
copy from ChangeLog
copy to ChangeLog.Nov2019
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %global name MonetDB
-%global version 11.34.0
+%global version 11.36.0
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
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
@@ -662,7 +662,7 @@
 #define PACKAGE_URL "https://www.monetdb.org/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.34.0"
+#define PACKAGE_VERSION "11.36.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 - 2019 MonetDB B.V.
 
-VERSION=11.34.0
+VERSION=11.36.0
 #       ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Nov2019
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Nov2019
diff --git a/clients/ChangeLog b/clients/ChangeLog.Nov2019
copy from clients/ChangeLog
copy to clients/ChangeLog.Nov2019
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Nov2019
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Nov2019
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,34,0,1
-  PRODUCTVERSION 11,34,0,1
+  FILEVERSION 11,36,0,1
+  PRODUCTVERSION 11,36,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.34.0\0"
+      VALUE "FileVersion", "11.36.0\0"
       //                    ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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.34.0\0"
+      VALUE "ProductVersion", "11.36.0\0"
       //                       ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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,34,0,1
-  PRODUCTVERSION 11,34,0,1
+  FILEVERSION 11,36,0,1
+  PRODUCTVERSION 11,36,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.34.0\0"
+      VALUE "FileVersion", "11.36.0\0"
       //                    ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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.34.0\0"
+      VALUE "ProductVersion", "11.36.0\0"
       //                       ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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,34,0,1
- PRODUCTVERSION 11,34,0,1
+ FILEVERSION 11,36,0,1
+ PRODUCTVERSION 11,36,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.34.0"
+            VALUE "FileVersion", "11.36.0"
             VALUE "InternalName", "libMonetODBCs.dll"
             VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2019"
             VALUE "OriginalFilename", "libMonetODBCs.dll"
             VALUE "ProductName", "MonetDB SQL Server"
-            VALUE "ProductVersion", "11.34.0"
+            VALUE "ProductVersion", "11.36.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Nov2019
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Nov2019
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -52,7 +52,7 @@ dnl  configure file, whereas comments st
 dnl  (including their trailing newline).
 
 AC_PREREQ([2.63b])
-AC_INIT([MonetDB], [11.34.0], [https://bugs.monetdb.org/], [MonetDB], 
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.36.0], [https://bugs.monetdb.org/], [MonetDB], 
[https://www.monetdb.org/])
 AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2019 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,8 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Thu Apr 18 2019 Sjoerd Mullender <[email protected]>
-- All forms of BATcalcbetween and VARcalcbetween have extra bool arguments
-  for low inclusive, high inclusive and nils false.  The latter causes
-  the result to be false instead of nil if the value being checked is nil.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Nov2019
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Nov2019
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,34,0,1
-  PRODUCTVERSION 11,34,0,1
+  FILEVERSION 11,36,0,1
+  PRODUCTVERSION 11,36,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.34.0\0"
+      VALUE "FileVersion", "11.36.0\0"
       //                    ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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.34.0\0"
+      VALUE "ProductVersion", "11.36.0\0"
       //                       ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] for details and/or 
assistance.
diff --git a/geom/ChangeLog b/geom/ChangeLog.Nov2019
copy from geom/ChangeLog
copy to geom/ChangeLog.Nov2019
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,38 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Mon Jul  1 2019 Sjoerd Mullender <[email protected]>
-- Implemented a function bat.diffcand to calculate difference of two
-  candidate lists.
-
-* Fri Jun 14 2019 Sjoerd Mullender <[email protected]>
-- The mtime module was completely rewritten, the atom types date,
-  daytime, and timestamp were changed.  Upgrade code for BATs
-  containing these types has been implemented.  The old daytime type
-  used a 32 bit integer to record milliseconds since the start of the
-  day.  The new daytime type uses a 64 bit integer to record
-  microseconds since the start of the day.  The old date type recorded
-  days since or before the year 1.  The new daytime type records the
-  day of the month and the number of months since the year -4712
-  separately in a single 32 bit integer of which only 26 bits are
-  used.  Dates now use the proleptic Gregorian calendar, meaning the
-  normal Gregorian callendar has been extended backward, and before
-  the year 1, we have the year 0.  Both the old and new timestamp
-  types are a combination of a daytime and a date value, but since
-  those types have changed, the timestamp type has also changed.  The
-  new date type has a smaller range than the old.  The new date range
-  is from the year -4712 to the year 170049.  During conversion of
-  date and timestamp columns, the dates are clamped to this range.
-- The tzone and rule atom types have been removed.  They were not used
-  by any code, and they were defined in a non-portable way.
-
-* Thu May  2 2019 Pedro Ferreira <[email protected]>
-- Added "mapi_ipv6" property to monet_options to force ipv6 address
-  binding only.  This property is inherited while forking from
-  monetdbd if it is also set there.
-
-* Thu Apr 18 2019 Sjoerd Mullender <[email protected]>
-- Removed (bat)calc.between_symmetric and changed (bat)calc.between
-  by adding a number of extra arguments, all of type :bit: symmetric,
-  low inclusive, high inclusive, nils false.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Nov2019
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Nov2019
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,34,0,1
-  PRODUCTVERSION 11,34,0,1
+  FILEVERSION 11,36,0,1
+  PRODUCTVERSION 11,36,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.34.0\0"
+      VALUE "FileVersion", "11.36.0\0"
       //                    ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] 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.34.0\0"
+      VALUE "ProductVersion", "11.36.0\0"
       //                       ^^^^^^^^
       // Maintained via vertoo. Please don't modify by hand!
       // Contact [email protected] for details and/or 
assistance.
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,22 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Fri Jul 12 2019 Pedro Ferreira <[email protected]>
-- Added sys.deltas ("schema" string, "table" string, "column" string)
-  returns table ("values" bigint) system function which returns a single
-  column with 6 values: a flag indicating if the column's upper table is
-  cleared or not, the count of the RDONLY, RD_INS and RD_UPD_ID deltas
-  of the column itself, the number of deleted values of the column's
-  table, as well as the level of the current transaction in the
-  transaction level tree. It should be used for debugging purposes only.
-
-* Mon May  6 2019 Pedro Ferreira <[email protected]>
-- Added "VALUES row_list" statement as a top SQL projection statement.
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to