Changeset: d88f9bb96ecb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d88f9bb96ecb
Modified Files:
monetdb5/mal/mal_interpreter.c
Branch: Jul2021
Log Message:
Backported changeset 7084820ef155 into Jul2021
diffs (26 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -933,8 +933,10 @@ str runMALsequence(Client cntxt, MalBlkP
/* unknown exceptions lead to propagation */
if (exceptionVar == -1) {
- if (cntxt->querytimeout && mb->starttime && GDKusec()-
mb->starttime > cntxt->querytimeout)
- ret= createException(MAL, "mal.interpreter",
SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
+ if (cntxt->querytimeout && mb->starttime &&
GDKusec()- mb->starttime > cntxt->querytimeout) {
+ freeException(ret);
+ ret = createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
+ }
stkpc = mb->stop;
continue;
}
@@ -983,7 +985,8 @@ str runMALsequence(Client cntxt, MalBlkP
}
if (stkpc == mb->stop) {
if (cntxt->querytimeout && mb->starttime &&
GDKusec()- mb->starttime > cntxt->querytimeout){
- ret= createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
+ freeException(ret);
+ ret = createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
stkpc = mb->stop;
}
continue;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
