MonetDB: default - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: 938cec0c246d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=938cec0c246d
Modified Files:
        sql/backends/monet5/sql_execute.c
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (20 lines):

diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -415,13 +415,9 @@ SQLstatementIntern(Client c, str *expr, 
                if (result) { /* return all results sets */
                        *result = m->results;
                } else {
-                       int i;
-                       for (i = 0; i < m->results->nr_cols; i++) {
-                               GDKfree(m->results->cols[i].tn);
-                               GDKfree(m->results->cols[i].name);
-                       }
-                       GDKfree(m->results->cols);
-                       GDKfree(m->results);
+                       if (m->results == o->results)
+                               o->results = NULL;
+                       res_tables_destroy(m->results);
                }
                m->results = NULL;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list