Changeset: 3578eca5021b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3578eca5021b
Modified Files:
monetdb5/mal/mal_runtime.c
Branch: unlock
Log Message:
merged with default
diffs (28 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -63,7 +63,7 @@ isaSQLquery(MalBlkPtr mb){
/* clear the next entry for a new call unless it is a running query */
static void
-clearQRYqueue(lng idx)
+clearQRYqueue(size_t idx)
{
QRYqueue[idx].query = 0;
QRYqueue[idx].cntxt = 0;
@@ -113,6 +113,7 @@ dropQRYqueue(void)
GDKfree(QRYqueue[i].query);
if(QRYqueue[i].username)
GDKfree(QRYqueue[i].username);
+ clearQRYqueue(i);
}
GDKfree(QRYqueue);
QRYqueue = NULL;
@@ -175,6 +176,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
QRYqueue[qhead].start = time(0);
q = isaSQLquery(mb);
QRYqueue[qhead].query = q? GDKstrdup(q):0;
+ GDKfree(QRYqueue[qhead].username);
AUTHgetUsername(&QRYqueue[qhead].username, cntxt);
QRYqueue[qhead].idx = cntxt->idx;
QRYqueue[qhead].memory = (int) (stk->memory / LL_CONSTANT(1048576)); /*
Convert to MB */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
