MonetDB: default - set path more on the pwsh way

[Niels Nes via checkin-list]

Changeset: 8cad8bb7e702 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8cad8bb7e702
Modified Files:
        .github/workflows/linux.yml
        sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:

set path more on the pwsh way


diffs (40 lines):

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -115,7 +115,7 @@ jobs:
       - name: mtest 
         shell: pwsh
         run: |
-          set PATH=C:\MDB\lib;C:\MDB\lib\monetdb5;C:\MDB\bin;%PATH%
+          $Env:PATH = 'C:\MDB\lib;C:\MDB\lib\monetdb5;C:\MDB\bin;' + $Env:PATH
           Mtest.py -r --debug=0 --ci --no-html --TSTTRGBASE=.
         if: runner.os == 'Windows'
 
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
@@ -268,15 +268,13 @@ cleanup:
 }
 
 static int
-__attribute__((__noinline__))
-_create_relational_function(mvc *m, const char *mod, const char *name, sql_rel 
*rel, stmt *call, list *rel_ops, int inline_func)
+_create_relational_function(mvc *m, const char *mod, const char *name, sql_rel 
*r, stmt *call, list *rel_ops, int inline_func)
 {
        Client c = MCgetClient(m->clientid);
        backend *be = (backend *) c->sqlcontext;
        Symbol symbackup = c->curprg;
        backend bebackup = *be;         /* backup current backend */
        exception_buffer ebsave = m->sa->eb;
-       sql_rel *r = rel;
 
        if (strlen(mod) >= IDLENGTH) {
                (void) sql_error(m, 10, SQLSTATE(42000) "Module name '%s' too 
large for the backend", mod);
@@ -298,6 +296,7 @@ static int
                sql_error(m, 10, SQLSTATE(HY013) MAL_MALLOC_FAIL);
                goto bailout;
        } else if (eb_savepoint(&m->sa->eb)) {
+               r = NULL;
                sql_error(m, 10, "%s", m->sa->eb.msg);
                freeSymbol(c->curprg);
                goto bailout;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org