Changeset: 2533fcb15ef1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2533fcb15ef1
Modified Files:
        sql/backends/monet5/vaults/odbc/odbc_loader.c
        sql/server/rel_optimize_proj.c
Branch: nested
Log Message:

merged with default


diffs (192 lines):

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
@@ -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/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/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -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/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
@@ -1261,25 +1261,15 @@ odbc_query(int caller, mvc *sql, sql_sub
                                                                                
guid_val.Data1, guid_val.Data2, guid_val.Data3, guid_val.Data4[0], 
guid_val.Data4[1], guid_val.Data4[2],
                                                                                
guid_val.Data4[3], guid_val.Data4[4], guid_val.Data4[5], guid_val.Data4[6], 
guid_val.Data4[7]);
                                                                if 
(colmetadata[col].battype == TYPE_uuid) {
-                                                                       uint8_t 
u;
-                                                                       // uuid 
is 16 bytes, same as SQLGUID guid_val
-                                                                       
memcpy((void *) &u_val.uuid_val, (void *) &guid_val, sizeof(uuid));
-                                                                       // 
guid_str: beefc4f7-0264-4735-9b7a-75fd371ef803
-                                                                       // 
becomes
-                                                                       // 
uuid_str: f7c4efbe-6402-3547-9b7a-75fd371ef803
-                                                                       // have 
to fix the swapped bytes
-                                                                       u = 
u_val.u[0];
-                                                                       
u_val.u[0] = u_val.u[3];
-                                                                       
u_val.u[3] = u;
-                                                                       u = 
u_val.u[1];
-                                                                       
u_val.u[1] = u_val.u[2];
-                                                                       
u_val.u[2] = u;
-                                                                       u = 
u_val.u[4];
-                                                                       
u_val.u[4] = u_val.u[5];
-                                                                       
u_val.u[5] = u;
-                                                                       u = 
u_val.u[6];
-                                                                       
u_val.u[6] = u_val.u[7];
-                                                                       
u_val.u[7] = u;
+                                                                       
u_val.u[0] = (guid_val.Data1 >> 24) & 0xFF;
+                                                                       
u_val.u[1] = (guid_val.Data1 >> 16) & 0xFF;
+                                                                       
u_val.u[2] = (guid_val.Data1 >> 8) & 0xFF;
+                                                                       
u_val.u[3] = guid_val.Data1 & 0xFF;
+                                                                       
u_val.u[4] = (guid_val.Data2 >> 8) & 0xFF;
+                                                                       
u_val.u[5] = guid_val.Data2 & 0xFF;
+                                                                       
u_val.u[6] = (guid_val.Data3 >> 8) & 0xFF;
+                                                                       
u_val.u[7] = guid_val.Data3 & 0xFF;
+                                                                       
memcpy(&u_val.u[8], &guid_val.Data4[0], 8);
                                                                        gdkret 
= BUNappend(b, (void *) &u_val.uuid_val, false);
                                                                } else {
                                                                        gdkret 
= BUNappend(b, ATOMnilptr(b->ttype), false);
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -546,9 +546,6 @@ rel_push_project_up_(visitor *v, sql_rel
                        t = (l->op == op_project && l->l)?l->l:l;
                        l_exps = rel_projections(v->sql, t, NULL, 1, 1);
                        /* conflict with old right expressions */
-                       r_exps = rel_projections(v->sql, r, NULL, 1, 1);
-                       if (rel->attr)
-                               append(r_exps, exp_ref(v->sql, 
rel->attr->h->data));
                        t = (r->op == op_project && r->l)?r->l:r;
                        r_exps = rel_projections(v->sql, t, NULL, 1, 1);
                        /* conflict with new right expressions */
diff --git a/tools/merovingian/client/monetdb.1 
b/tools/merovingian/client/monetdb.1
--- a/tools/merovingian/client/monetdb.1
+++ b/tools/merovingian/client/monetdb.1
@@ -11,7 +11,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MONETDB 1 2025-03-17 MonetDB "MonetDB Applications"
+.TH MONETDB 1 2025-03-24 MonetDB "MonetDB Applications"
 .SH NAME
 monetdb \- control a MonetDB Database Server instance
 .SH SYNOPSIS
diff --git a/tools/merovingian/daemon/monetdbd.1.in 
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -11,7 +11,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MONETDBD 1 2025-03-17 MonetDB "MonetDB Applications"
+.TH MONETDBD 1 2025-03-24 MonetDB "MonetDB Applications"
 .SH NAME
 monetdbd \- the MonetDB Database Server daemon
 .SH SYNOPSIS
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -11,7 +11,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MSERVER5 1 2025-03-17 MonetDB "MonetDB Applications"
+.TH MSERVER5 1 2025-03-24 MonetDB "MonetDB Applications"
 .SH NAME
 mserver5 \- the MonetDB server version 5
 .SH SYNOPSIS
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to