MonetDB: Dec2016 - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: 55237f6c03b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55237f6c03b8
Modified Files:
        monetdb5/mal/mal_instruction.c
        sql/backends/monet5/sql_scenario.c
Branch: Dec2016
Log Message:

Merge with Jun2016 branch.


diffs (33 lines):

diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -735,15 +735,14 @@ makeVarSpace(MalBlkPtr mb)
                VarPtr *new;
                int s = mb->vsize * 2;
 
-               new = (VarPtr *) GDKzalloc(s * sizeof(VarPtr));
+               new = GDKrealloc(mb->var, s * sizeof(VarPtr));
                if (new == NULL) {
                        mb->errors++;
                        showScriptException(GDKout, mb, 0, MAL, "newMalBlk:no 
storage left\n");
                        assert(0);
                        return -1;
                }
-               memcpy((char *) new, (char *) mb->var, sizeof(VarPtr) * 
mb->vtop);
-               GDKfree(mb->var);
+               memset(new + mb->vsize, 0, (s - mb->vsize) * sizeof(VarPtr));
                mb->vsize = s;
                mb->var = new;
        }
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
@@ -1161,7 +1161,7 @@ SQLparser(Client c)
                        showErrors(c);
                        /* restore the state */
                        MSresetInstructions(c->curprg->def, oldstop);
-                       freeVariables(c, c->curprg->def, c->glb, oldvtop);
+                       freeVariables(c, c->curprg->def, NULL, oldvtop);
                        c->curprg->def->errors = 0;
                        msg = createException(PARSE, "SQLparser", 
"M0M27!Semantic errors");
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list