MonetDB: resource_management - fix failing ctest

[svetlin via checkin-list]

Changeset: 2be7c40f0258 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2be7c40f0258
Modified Files:
        sql/backends/monet5/sql_scenario.c
        tools/monetdbe/monetdbe.c
Branch: resource_management
Log Message:

fix failing ctest


diffs (33 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
@@ -1570,7 +1570,6 @@ SQLparser_body(Client c, backend *be)
 
                        if (be->q) {
                                int res = 0;
-                               be->result_id = be->q->id;
                                if (!err && (res = mvc_export_prepare(be, 
c->fdout)) < 0) {
                                        msg = createException(PARSE, 
"SQLparser", SQLSTATE(45000) "Export operation failed: %s", 
mvc_export_error(be, c->fdout, res));
                                        err = 1;
@@ -1578,7 +1577,10 @@ SQLparser_body(Client c, backend *be)
                                if (err) {
                                        be->q->name = NULL; /* later remove 
cleanup from mal from qc code */
                                        qc_delete(m->qc, be->q);
+                                       be->q = NULL;
                                }
+                               if (be->q)
+                                       be->result_id = be->q->id;
                                be->q = NULL;
                        }
                        if (err)
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -1722,6 +1722,7 @@ monetdbe_bind(monetdbe_statement *stmt, 
                        return stmt_internal->mdbe->msg;
                }
                VALset(&stmt_internal->data[i], tpe, val);
+               // FIX this leaks no free for val
        } else {
                VALset(&stmt_internal->data[i], tpe, data);
        }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org