MonetDB: Oct2020 - merged with jun2020

[Niels Nes]

Changeset: 2991a3bac47b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2991a3bac47b
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Oct2020
Log Message:

merged with jun2020


diffs (23 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -789,7 +789,8 @@ SQLreader(Client c)
                /* auto_commit on end of statement */
                if (language != 'D' && m->scanner.mode == LINE_N && 
!commit_done) {
                        msg = SQLautocommit(m);
-                       go = msg == MAL_SUCCEED;
+                       if (msg)
+                               break;
                        commit_done = true;
                }
                if (m->session->tr && m->session->tr->active)
@@ -813,7 +814,8 @@ SQLreader(Client c)
                                   and start a transaction on the start of a 
new statement (s A;B; case) */
                                if (language != 'D' && !(m->emod & mod_debug) 
&& !commit_done) {
                                        msg = SQLautocommit(m);
-                                       go = msg == MAL_SUCCEED;
+                                       if (msg)
+                                               break;
                                        commit_done = true;
                                }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list