MonetDB: Dec2023 - Merge with Jun2023 branch.

[Sjoerd Mullender via checkin-list]

Changeset: 8e4d4e44f3e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8e4d4e44f3e2
Modified Files:
        sql/backends/monet5/sql_gencode.c
        sql/server/sql_partition.c
Branch: Dec2023
Log Message:

Merge with Jun2023 branch.


diffs (22 lines):

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
@@ -288,7 +288,8 @@ static int
        backend_reset(be);
 
        int nargs;
-       relational_func_create_result_part1(m, &r, &nargs);
+       sql_rel *nr = r;
+       relational_func_create_result_part1(m, &nr, &nargs);
        nargs += (call && call->type == st_list) ? list_length(call->op4.lval) 
: rel_ops ? list_length(rel_ops) : 0;
 
        c->curprg = newFunctionArgs(putName(mod), putName(name), 
FUNCTIONsymbol, nargs);
@@ -300,7 +301,7 @@ static int
                sql_error(m, 10, "%s", m->sa->eb.msg);
                freeSymbol(c->curprg);
                goto bailout;
-       } else if (_create_relational_function_body(m, r, call, rel_ops, 
inline_func) < 0) {
+       } else if (_create_relational_function_body(m, nr, call, rel_ops, 
inline_func) < 0) {
                goto bailout;
        }
        *be = bebackup;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org