Changeset: 1d7250554df8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1d7250554df8
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_statement.c
Branch: resource_management
Log Message:
small fix
diffs (42 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -859,7 +859,7 @@ getVariable(Client cntxt, MalBlkPtr mb,
src = &(var->var.data);
dst = &stk->stk[getArg(pci, 0)];
// which alloc to use?
- if (VALcopy(cntxt->alloc, dst, src) == NULL)
+ if (VALcopy(mb->ma, dst, src) == NULL)
throw(MAL, "sql.getVariable", SQLSTATE(HY013) MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
@@ -5056,7 +5056,7 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
goto finalize;
}
}
- if (!(env = prepareMALstack(cntxt->alloc, nmb, nmb->vsize))) {
/* needed for result */
+ if (!(env = prepareMALstack(mb->ma, nmb, nmb->vsize))) { /*
needed for result */
ret = createException(MAL, "sql.unionfunc",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
goto finalize;
}
@@ -5074,7 +5074,7 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
start = 2;
}
for (BUN cur = 0; cur<cnt && !ret; cur++ ) {
- MalStkPtr nstk = prepareMALstack(cntxt->alloc, nmb,
nmb->vsize);
+ MalStkPtr nstk = prepareMALstack(mb->ma, nmb,
nmb->vsize);
int i,ii;
if (!nstk) { /* needed for result */
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1540,7 +1540,7 @@ constantAtom(MalBlkPtr mb, atom *a)
ValRecord cst;
if (atom_null(a)) {
- VALinit(NULL, &cst, tpe, ATOMnilptr(tpe));
+ VALinit(mb->ma, &cst, tpe, ATOMnilptr(tpe));
} else {
cst.vtype = 0;
if (SA_VALcopy(mb->ma, &cst, vr) == NULL)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
