Changeset: 6e032d364805 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6e032d364805 Modified Files: sql/backends/monet5/sql_gencode.c Branch: nested Log Message:
merged with default diffs (62 lines): diff --git a/ChangeLog.Mar2025 b/ChangeLog.Mar2025 --- a/ChangeLog.Mar2025 +++ b/ChangeLog.Mar2025 @@ -1,15 +1,6 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Fri Jun 13 2025 Joeri van Ruth <[email protected]> -- Add optional parameters omit_unlogged (bool) and omit_table_ids (str) to - sys.hot_snapshot(). If omit_unlogged is set to true, the data in UNLOGGED - tables is omitted from the snapshot. If omit_table_ids is given, it must - be a comma-separated list of table ids as found in sys.tables. The data in - each of those tables will be omitted from the snapshot. -- Empty BATs are omitted from the snapshot, the restored server will created - them if necessary. - * Thu May 8 2025 Sjoerd Mullender <[email protected]> - It is now possible to specify an idle timeout using --set idle_timeout=<seconds> (see mserver5 manual page) which gets triggered diff --git a/sql/ChangeLog.Mar2025 b/sql/ChangeLog.Mar2025 --- a/sql/ChangeLog.Mar2025 +++ b/sql/ChangeLog.Mar2025 @@ -5,6 +5,15 @@ - When a prepared statement is executed, sys.queue now shows the text of the original PREPARE statement along with the EXEC and its arguments. +* Fri Jun 13 2025 Joeri van Ruth <[email protected]> +- Add optional parameters omit_unlogged (bool) and omit_table_ids (str) to + sys.hot_snapshot(). If omit_unlogged is set to true, the data in UNLOGGED + tables is omitted from the snapshot. If omit_table_ids is given, it must + be a comma-separated list of table ids as found in sys.tables. The data in + each of those tables will be omitted from the snapshot. +- Empty BATs are omitted from the snapshot, the restored server will created + them if necessary. + * Wed May 14 2025 Martin van Dinther <[email protected]> - Corrected reading decimal type columns from external ODBC data sources via proto_loader('odbc:...'). Those columns were mapped to varchar type diff --git a/sql/backends/monet5/sql_gencode.c b/sql/backends/monet5/sql_gencode.c --- a/sql/backends/monet5/sql_gencode.c +++ b/sql/backends/monet5/sql_gencode.c @@ -1042,6 +1042,10 @@ backend_dumpstmt_body(backend *be, MalBl if (cq_query) { size_t buf_sz = 2 + strlen(query) + strlen(cq_query); buf = GDKmalloc(buf_sz * sizeof(char)); + if (buf == NULL) { + sql_error(m, 10, SQLSTATE(HY013) MAL_MALLOC_FAIL); + return -1; + } snprintf(buf, buf_sz, "%.*s %s", (int)strlen(query) - 1, query, cq_query); query = buf; } @@ -1049,8 +1053,7 @@ backend_dumpstmt_body(backend *be, MalBl q = pushStr(mb, q, query); q = pushStr(mb, q, getSQLoptimizer(be->mvc)); pushInstruction(mb, q); - if (cq_query) - GDKfree(buf); + GDKfree(buf); } /* announce the transaction mode */ _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
