MonetDB: Jun2020 - Clean curprg error if so

[Pedro Ferreira]

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

Clean curprg error if so


diffs (17 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
@@ -1310,10 +1310,13 @@ SQLparser(Client c)
                                msg = SQLoptimizeQuery(c, c->curprg->def);
 
                                if (msg != MAL_SUCCEED) {
+                                       str other = c->curprg->def->errors;
                                        c->curprg->def->errors = 0;
                                        MSresetInstructions(c->curprg->def, 
oldstop);
                                        freeVariables(c, c->curprg->def, NULL, 
oldvtop);
                                        sqlcleanup(m, err);
+                                       if (other != msg)
+                                               freeException(other);
                                        goto finalize;
                                }
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list