Changeset: e6b3739a71bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e6b3739a71bb
Modified Files:
        .bumpversion.cfg
        ChangeLog
        MonetDB.spec
        clients/mapilib/mapi.rc
        clients/odbc/ChangeLog
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        cmake/monetdb-versions.cmake
        debian/control
        gdk/ChangeLog
        gdk/libbat.rc
        monetdb5/ChangeLog
        monetdb5/tools/libmonetdb5.rc
        sql/ChangeLog
Branch: default
Log Message:

Step two towards a new stable branch "Dec2025".

Increment version numbers.

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


diffs (truncated from 435 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.54.0
+current_version = 11.56.0
 commit = False
 tag = False
 
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Tue Sep 16 2025 Sjoerd Mullender <[email protected]>
-- This server is no longer compatible with the MonetDB Stethoscope.
-
-* Mon Apr 28 2025 Niels Nes <[email protected]>
-- Changed the way complex AND and OR expressions are handled. The new
-  expression tree uses 2 new cmp flag (cmp_con/cmp_dis), both expressions
-  hold lists of expressions. This structure reduces the need for stack
-  space, allowing way larger expressions trees to be handled.
-
diff --git a/ChangeLog b/ChangeLog.Dec2025
copy from ChangeLog
copy to ChangeLog.Dec2025
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -8,7 +8,7 @@
 # Copyright August 2008 - 2023 MonetDB B.V.;
 # Copyright 1997 - July 2008 CWI.
 
-%global version 11.54.0
+%global version 11.56.0
 
 %bcond_with compat
 
diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2025
copy from clients/ChangeLog
copy to clients/ChangeLog.Dec2025
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Dec2025
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Dec2025
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,54,0)
-  PRODUCTVERSION version(11,54,0)
+  FILEVERSION version(11,56,0)
+  PRODUCTVERSION version(11,56,0)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
       VALUE "Comments", "\0"
       VALUE "CompanyName", "MonetDB Foundation\0"
       VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-      VALUE "FileVersion", sversion(11,54,0)
+      VALUE "FileVersion", sversion(11,56,0)
       VALUE "InternalName", "Mapi\0"
       VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
       VALUE "LegalTrademarks", "\0"
       VALUE "OriginalFilename", "Mapi.dll\0"
       VALUE "PrivateBuild", "\0"
       VALUE "ProductName", "MonetDB Client Libraries\0"
-      VALUE "ProductVersion", sversion(11,54,0)
+      VALUE "ProductVersion", sversion(11,56,0)
       VALUE "SpecialBuild", "\0"
     END
   END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog
--- a/clients/odbc/ChangeLog
+++ b/clients/odbc/ChangeLog
@@ -1,9 +1,3 @@
 # ChangeLog file for odbc
 # This file is updated with Maddlog
 
-* Wed Jul  9 2025 Martin van Dinther <[email protected]>
-- Corrected SQLColAttribute() and SQLGetDescField() for when
-  FieldIdentifier is SQL_DESC_LITERAL_PREFIX or SQL_DESC_LITERAL_SUFFIX.
-  They will now return the correct literal prefix or suffix string
-  instead of an empty string depending on the datatype of the column.
-
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Dec2025
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Dec2025
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,54,0)
-  PRODUCTVERSION version(11,54,0)
+  FILEVERSION version(11,56,0)
+  PRODUCTVERSION version(11,56,0)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
       VALUE "Comments", "\0"
       VALUE "CompanyName", "MonetDB Foundation\0"
       VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-      VALUE "FileVersion", sversion(11,54,0)
+      VALUE "FileVersion", sversion(11,56,0)
       VALUE "InternalName", "MonetODBC\0"
       VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
       VALUE "LegalTrademarks", "\0"
       VALUE "OriginalFilename", "MonetODBC.dll\0"
       VALUE "PrivateBuild", "\0"
       VALUE "ProductName", "MonetDB ODBC Driver\0"
-      VALUE "ProductVersion", sversion(11,54,0)
+      VALUE "ProductVersion", sversion(11,56,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
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,54,0)
- PRODUCTVERSION version(11,54,0)
+ FILEVERSION version(11,56,0)
+ PRODUCTVERSION version(11,56,0)
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MonetDB Foundation"
             VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-            VALUE "FileVersion", sversion(11,54,0)
+            VALUE "FileVersion", sversion(11,56,0)
             VALUE "InternalName", "MonetODBCs.dll"
             VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB 
Foundation"
             VALUE "OriginalFilename", "MonetODBCs.dll"
             VALUE "ProductName", "MonetDB ODBC Setup"
-            VALUE "ProductVersion", sversion(11,54,0)
+            VALUE "ProductVersion", sversion(11,56,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
@@ -11,7 +11,7 @@
 #]]
 
 set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "54")
+set(MONETDB_VERSION_MINOR "56")
 set(MONETDB_VERSION_PATCH "0")
 
 if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Dec2025
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Dec2025
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,10 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Tue Aug 26 2025 Lucas Pereira <[email protected]>
-- log_tflush function, when flushnow flag is true, now passes bitmap array
-  that indicates which bat id's need to be sync'ed to disk, instead
-  of passing NULL which would trigger a sync of the full catalog. If
-  new bats are added to the catalog, they will be sync'ed always (see
-  maxupdated flag).
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Dec2025
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Dec2025
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,54,0)
-  PRODUCTVERSION version(11,54,0)
+  FILEVERSION version(11,56,0)
+  PRODUCTVERSION version(11,56,0)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
       VALUE "Comments", "\0"
       VALUE "CompanyName", "MonetDB Foundation\0"
       VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
-      VALUE "FileVersion", sversion(11,54,0)
+      VALUE "FileVersion", sversion(11,56,0)
       VALUE "InternalName", "libbat\0"
       VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
       VALUE "LegalTrademarks", "\0"
       VALUE "OriginalFilename", "libbat.dll\0"
       VALUE "PrivateBuild", "\0"
       VALUE "ProductName", "MonetDB Common Libraries\0"
-      VALUE "ProductVersion", sversion(11,54,0)
+      VALUE "ProductVersion", sversion(11,56,0)
       VALUE "SpecialBuild", "\0"
     END
   END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Dec2025
copy from geom/ChangeLog
copy to geom/ChangeLog.Dec2025
diff --git a/misc/ChangeLog b/misc/ChangeLog.Dec2025
copy from misc/ChangeLog
copy to misc/ChangeLog.Dec2025
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,17 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Wed Sep 17 2025 Sjoerd Mullender <[email protected]>
-- We no longer persist querylog results.  If you want to keep the data,
-  make a copy into an SQL table.
-
-* Mon Sep 15 2025 Sjoerd Mullender <[email protected]>
-- The default_fast and minimal_fast optimizer pipelines have been
-  removed.  The default_pipe and minimal_pipe optimizers now use the
-  "fast" path always.
-
-* Mon Aug  4 2025 Sjoerd Mullender <[email protected]>
-- The type "pcre" has been removed.  There was no way to create a value of
-  the type, and there was only one function that used a value of the type.
-  That function (pcre.index) has also been removed.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Dec2025
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Dec2025
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,54,0)
-  PRODUCTVERSION version(11,54,0)
+  FILEVERSION version(11,56,0)
+  PRODUCTVERSION version(11,56,0)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
       VALUE "Comments", "\0"
       VALUE "CompanyName", "MonetDB Foundation\0"
       VALUE "FileDescription", "MonetDB5 Library DLL\0"
-      VALUE "FileVersion", sversion(11,54,0)
+      VALUE "FileVersion", sversion(11,56,0)
       VALUE "InternalName", "libmonetdb5\0"
       VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0"
       VALUE "LegalTrademarks", "\0"
       VALUE "OriginalFilename", "libmonetdb5.dll\0"
       VALUE "PrivateBuild", "\0"
       VALUE "ProductName", "MonetDB5 Server\0"
-      VALUE "ProductVersion", sversion(11,54,0)
+      VALUE "ProductVersion", sversion(11,56,0)
       VALUE "SpecialBuild", "\0"
     END
   END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,123 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Wed Nov  5 2025 Joeri van Ruth <[email protected]>
-- COPY BINARY has been optimized to be much faster when many string columns
-  are involved.
-- The performance of COPY BINARY of blob column has also been improved.
-- The performance of COPY BINARY ON CLIENT has been much improved. It used
-  to be much slower than ON SERVER, now it's only a little slower.
-- The file format for COPY BINARY strings has been extended. If the same
-  string occurs multiple times, later occurrences can refer back to
-  earlier occurrences instead of including another copy of the string.
-  This improves both file size and processing time.
-- A new tool 'backrefencode' has been added that can introduce these
-  back references or remove them again.
-- Rudimentary support for compressed ON CLIENT transfers has been added.
-  If you write ON 'algo' CLIENT, with algo=lz4/gz/xz/b2, the server compresses
-  downloaded data and decompresses uploaded data server-side using the given
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to