MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: d263727c997b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d263727c997b
Modified Files:
        sql/backends/monet5/sql_gencode.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (25 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
@@ -920,7 +920,6 @@ backend_dumpproc(backend *be, Client c, 
        if (c->curprg->def->errors) {
                sql_error(m, 10, SQLSTATE(42000) "Internal error while 
compiling statement: %s", c->curprg->def->errors);
                res = -1;
-               goto cleanup;
        }
 
        // restore the context for the wrapper code
diff --git a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.test 
b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.test
--- a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.test
+++ b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.test
@@ -8,9 +8,7 @@ statement error
 CREATE TRIGGER marketdata.calc_sdate BEFORE INSERT ON marketdata.quotes
 FOR EACH ROW
 BEGIN ATOMIC
- update marketdata.quotes set i = quotes.i +2 where quotes.i < 2
-
-statement error
+ update marketdata.quotes set i = quotes.i +2 where quotes.i < 2;
 END
 
 statement ok
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org