MonetDB: Nov2019 - Merge with Apr2019 branch.

[Sjoerd Mullender]

Changeset: 059c7884a05b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=059c7884a05b
Modified Files:
        sql/server/rel_semantic.c
        tools/merovingian/daemon/controlrunner.c
Branch: Nov2019
Log Message:

Merge with Apr2019 branch.


diffs (12 lines):

diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -88,6 +88,8 @@ rel_parse(mvc *m, sql_schema *s, char *q
        bstream_destroy(m->scanner.rs);
 
        m->sym = NULL;
+       o.vars = m->vars;       /* may have been realloc'ed */
+       o.sizevars = m->sizevars;
        if (m->session->status || m->errstr[0]) {
                int status = m->session->status;
                char errstr[ERRSIZE];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list