Changeset: 92062f540b79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/92062f540b79
Modified Files:
monetdb5/mal/mal_session.c
sql/backends/monet5/sql_scenario.c
Branch: Jan2022
Log Message:
merged with jul2021
diffs (44 lines):
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -344,7 +344,7 @@ MSscheduleClient(str command, str challe
mnstr_printf(c->fdout, "!%s\n", s);
mnstr_flush(c->fdout, MNSTR_FLUSH_DATA);
GDKfree(s);
- c->mode = FINISHCLIENT;
+ MCcloseClient(c);
}
if (!GDKgetenv_isyes(mal_enableflag) &&
(strncasecmp("sql", lang, 3) != 0 && uid != 0))
{
@@ -353,6 +353,7 @@ MSscheduleClient(str command, str challe
"run mserver5 with --set
%s=yes to change this.\n", mal_enableflag);
exit_streams(fin, fout);
GDKfree(command);
+ MCcloseClient(c);
return;
}
}
@@ -362,6 +363,7 @@ MSscheduleClient(str command, str challe
exit_streams(fin, fout);
freeException(msg);
GDKfree(command);
+ MCcloseClient(c);
return;
}
@@ -513,6 +515,7 @@ MSserveClient(Client c)
c->glb = newGlobalStack(MAXGLOBALS + mb->vsize);
if (c->glb == NULL) {
c->mode = RUNCLIENT;
+ MCcloseClient(c);
throw(MAL, "serveClient", SQLSTATE(HY013) MAL_MALLOC_FAIL);
} else {
c->glb->stktop = mb->vtop;
@@ -523,6 +526,7 @@ MSserveClient(Client c)
msg = defaultScenario(c);
if (msg) {
c->mode = RUNCLIENT;
+ MCcloseClient(c);
return msg;
} else {
do {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
