MonetDB: Jun2023 - Revert some unneeded changes.

[Sjoerd Mullender via checkin-list]

Changeset: 86d162714b44 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/86d162714b44
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Jun2023
Log Message:

Revert some unneeded changes.


diffs (26 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
@@ -1319,18 +1319,16 @@ SQLparser_body(Client c, backend *be)
 
                        Tbegin = GDKusec();
 
-                       int opt = ((m->emod & mod_exec) == 0); /* no need to 
optimze prepare - execute */
+                       int opt = 0;
                        if (backend_dumpstmt(be, c->curprg->def, r, !(m->emod & 
mod_exec), 0, c->query) < 0) {
-                               if (m->sa->eb.msg)
-                                       msg = createException(SQL, "SQLparser", 
"%s", m->sa->eb.msg);
-                               else
-                                       msg = handle_error(m, 0, MAL_SUCCEED);
+                               msg = handle_error(m, 0, msg);
                                err = 1;
                                MSresetInstructions(c->curprg->def, oldstop);
                                freeVariables(c, c->curprg->def, NULL, oldvtop, 
oldvid);
                                freeException(c->curprg->def->errors);
                                c->curprg->def->errors = NULL;
-                       }
+                       } else
+                               opt = ((m->emod & mod_exec) == 0); /* no need 
to optimze prepare - execute */
 
                        Tend = GDKusec();
                        if(profilerStatus > 0)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org