Changeset: 4e24bbe5524f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4e24bbe5524f
Branch: Mar2025
Log Message:

merged


diffs (truncated from 1551 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.53.2
+current_version = 11.53.4
 commit = False
 tag = False
 
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -839,3 +839,4 @@ 30e6380820842b9e0325536eb22d7cb3843ab095
 30e6380820842b9e0325536eb22d7cb3843ab095 Aug2024_SP2_release
 fd30df6fc710aa7615a995dd826389a67cddd47f Mar2025_root
 11a26808ab1bc96546077899924e5c31d7f2553c Mar2025_1
+ad290be8174693266b1e4eeab06af0266686af38 Mar2025_3
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.53.2
+%global version 11.53.4
 
 %bcond_with compat
 
@@ -1056,6 +1056,15 @@ rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetd
 %endif
 
 %changelog
+* Mon Mar 24 2025 Sjoerd Mullender <[email protected]> - 11.53.3-20250324
+- Rebuilt.
+- GH#7622: In PREPARE queries with many parameters, information about
+  parameters is truncated when sent to client.
+- GH#7623: Database crashed when using UPDATE xxx SET xxx RETURNING xx
+
+* Thu Mar 20 2025 Martin van Dinther <[email protected]> 
- 11.53.3-20250324
+- sql: Added scalar functions: dayname(d date) and monthname(d date) returns 
varchar(10).
+
 * Mon Mar 17 2025 Sjoerd Mullender <[email protected]> - 11.53.1-20250317
 - Rebuilt.
 - GH#7101: Feature request: nextafter() in SQL
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1663,6 +1663,7 @@ list *sa_list(allocator *sa);
 char *sa_message(allocator *sa, _In_z_ _Printf_format_string_ const char 
*format, ...) __attribute__((__format__(__printf__, 2, 3)));
 msettings *sa_msettings_create(allocator *sa);
 char *sa_msettings_to_string(const msettings *mp, allocator *sa, size_t 
size_hint);
+sql_type *schema_bind_type(mvc *sql, sql_schema *s, const char *name);
 str sht_dec2_bte(bte *res, const int *s1, const sht *v);
 str sht_dec2_dbl(dbl *res, const int *s1, const sht *v);
 str sht_dec2_flt(flt *res, const int *s1, const sht *v);
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -8,7 +8,7 @@
 .\" Copyright August 2008 - 2023 MonetDB B.V.;
 .\" Copyright 1997 - July 2008 CWI.
 .\"
-.TH MCLIENT 1 2025-03-17 MonetDB "MonetDB Applications"
+.TH MCLIENT 1 2025-03-24 MonetDB "MonetDB Applications"
 .SH NAME
 mclient \- the MonetDB command-line tool
 .SH SYNOPSIS
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,53,2)
-  PRODUCTVERSION version(11,53,2)
+  FILEVERSION version(11,53,4)
+  PRODUCTVERSION version(11,53,4)
   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,53,2)
+      VALUE "FileVersion", sversion(11,53,4)
       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,53,2)
+      VALUE "ProductVersion", sversion(11,53,4)
       VALUE "SpecialBuild", "\0"
     END
   END
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,53,2)
-  PRODUCTVERSION version(11,53,2)
+  FILEVERSION version(11,53,4)
+  PRODUCTVERSION version(11,53,4)
   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,53,2)
+      VALUE "FileVersion", sversion(11,53,4)
       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,53,2)
+      VALUE "ProductVersion", sversion(11,53,4)
       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,53,2)
- PRODUCTVERSION version(11,53,2)
+ FILEVERSION version(11,53,4)
+ PRODUCTVERSION version(11,53,4)
  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,53,2)
+            VALUE "FileVersion", sversion(11,53,4)
             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,53,2)
+            VALUE "ProductVersion", sversion(11,53,4)
         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
@@ -12,7 +12,7 @@
 
 set(MONETDB_VERSION_MAJOR "11")
 set(MONETDB_VERSION_MINOR "53")
-set(MONETDB_VERSION_PATCH "2")
+set(MONETDB_VERSION_PATCH "4")
 
 if(RELEASE_VERSION)
   set(MONETDB_RELEASE "unreleased")
@@ -44,7 +44,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "30")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -74,7 +74,7 @@ set(MUTILS_VERSION "${MUTILS_VERSION_MAJ
 
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "16")
-set(SQL_VERSION_MINOR "0")
+set(SQL_VERSION_MINOR "1")
 set(SQL_VERSION_PATCH "0")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+monetdb (11.53.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7622: In PREPARE queries with many parameters, information about
+    parameters is truncated when sent to client.
+  * GH#7623: Database crashed when using UPDATE xxx SET xxx RETURNING xx
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 24 Mar 2025 15:03:01 +0100
+
+monetdb (11.53.3) unstable; urgency=low
+
+  * sql: Added scalar functions: dayname(d date) and monthname(d date) returns 
varchar(10).
+
+ -- Martin van Dinther <[email protected]>  Thu, 20 Mar 
2025 15:03:01 +0100
+
 monetdb (11.53.1) unstable; urgency=low
 
   * Rebuilt.
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,53,2)
-  PRODUCTVERSION version(11,53,2)
+  FILEVERSION version(11,53,4)
+  PRODUCTVERSION version(11,53,4)
   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,53,2)
+      VALUE "FileVersion", sversion(11,53,4)
       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,53,2)
+      VALUE "ProductVersion", sversion(11,53,4)
       VALUE "SpecialBuild", "\0"
     END
   END
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,53,2)
-  PRODUCTVERSION version(11,53,2)
+  FILEVERSION version(11,53,4)
+  PRODUCTVERSION version(11,53,4)
   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,53,2)
+      VALUE "FileVersion", sversion(11,53,4)
       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,53,2)
+      VALUE "ProductVersion", sversion(11,53,4)
       VALUE "SpecialBuild", "\0"
     END
   END
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Mar 20 2025 Martin van Dinther <[email protected]> 
- 11.53.3-20250324
+- Added scalar functions: dayname(d date) and monthname(d date) returns 
varchar(10).
+
 * Tue Mar 11 2025 Niels Nes <[email protected]> - 11.53.1-20250317
 - ranking window functions are now optimized into topn's
   For the grouped case we added the missing grouped/heap based topn
diff --git a/sql/ChangeLog.Mar2025 b/sql/ChangeLog.Mar2025
--- a/sql/ChangeLog.Mar2025
+++ b/sql/ChangeLog.Mar2025
@@ -1,6 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Thu Mar 20 2025 Martin van Dinther <[email protected]>
-- Added scalar functions: dayname(d date) and monthname(d date) returns 
varchar(10).
-
diff --git a/sql/backends/monet5/vaults/odbc/odbc_loader.c 
b/sql/backends/monet5/vaults/odbc/odbc_loader.c
--- a/sql/backends/monet5/vaults/odbc/odbc_loader.c
+++ b/sql/backends/monet5/vaults/odbc/odbc_loader.c
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to