Changeset: 50620ddebeb7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50620ddebeb7
Modified Files:
monetdb5/mal/mal_interpreter.c
Branch: Jan2014
Log Message:
Don't overwrite existing exception.
diffs (13 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
@@ -1158,7 +1158,8 @@ str runMALsequence(Client cntxt, MalBlkP
stkpc++;
}
if (cntxt->qtimeout && GDKusec()- mb->starttime >
cntxt->qtimeout){
- ret= createException(MAL, "mal.interpreter",
RUNTIME_QRY_TIMEOUT);
+ if (ret == MAL_SUCCEED)
+ ret= createException(MAL, "mal.interpreter",
RUNTIME_QRY_TIMEOUT);
stkpc= mb->stop;
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
