Changeset: e53760676ec5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e53760676ec5
Modified Files:
monetdb5/mal/mal_instruction.c
sql/backends/monet5/sql_execute.c
Branch: default
Log Message:
Fix compilation
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
@@ -18,7 +18,7 @@
#include "mal_private.h"
/* to avoid memory fragmentation stmt and var blocks are allocated in chunks */
-#define MALCHUNK 32
+#define MALCHUNK 128
/* If we encounter an error it can be left behind in the MalBlk
* for the upper layers to abandon the track
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
@@ -776,7 +776,6 @@ RAstatement(Client c, MalBlkPtr mb, MalS
else
msg = createException(SQL, "RAstatement",
SQLSTATE(42000) "%s", m->errstr);
} else {
- int oldvtop = c->curprg->def->vtop, oldstop =
c->curprg->def->stop, oldvid = c->curprg->def->vid;
if (*opt && rel)
rel = sql_processrelation(m, rel, 1, 1);
@@ -798,8 +797,7 @@ RAstatement(Client c, MalBlkPtr mb, MalS
if( msg == MAL_SUCCEED)
msg = SQLrun(c,m);
if (!msg) {
- resetMalBlk(c->curprg->def, oldstop);
- freeVariables(c, c->curprg->def, NULL, oldvtop, oldvid);
+ resetMalBlk(c->curprg->def);
}
}
return RAcommit_statement(be, msg);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
