Changeset: a0104be272e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a0104be272e6
Modified Files:
clients/mapiclient/mclient.c
monetdb5/mal/mal_interpreter.c
Branch: default
Log Message:
merged with sep2022
diffs (60 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3578,7 +3578,6 @@ main(int argc, char **argv)
} else {
if (mode == SQL) {
setFormatter("sql");
- mapi_set_size_header(mid, false);
} else {
setFormatter("raw");
mapi_set_size_header(mid, true);
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
@@ -546,17 +546,19 @@ runMALsequence(Client cntxt, MalBlkPtr m
ret= createException(MAL, "mal.interpreter",
"prematurely stopped client");
break;
}
+
+ if (stk->status) {
+ while (stk->status == 'p')
+ MT_sleep_ms(50);
+ continue;
+ if (stk->status == 'q') {
+ stkpc = mb->stop;
+ ret = createException(MAL, "mal.interpreter",
"Prematurely stopped client");
+ }
+ }
+
#ifndef NDEBUG
- if (cntxt->itrace || stk->status) {
- if (stk->status == 'p'){
- // execution is paused
- while (stk->status == 'p')
- MT_sleep_ms(50);
- continue;
- }
- if (stk->status == 'q')
- stk->cmd = 'x';
-
+ if (cntxt->itrace) {
if (stk->cmd == 0)
stk->cmd = cntxt->itrace;
mdbStep(cntxt, mb, stk, stkpc);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3805,10 +3805,11 @@ def main(argv) :
# fix up URLPREFIX
if REV:
URLPREFIX += '%s/' % REV.split()[0].rstrip('+')
- os.environ['REVISION'] = REV
else:
# if no revision known, can't refer to repository
URLPREFIX = None
+ if REV:
+ os.environ['REVISION'] = REV
global SOCK, HOST
try: # try/finally to clean up sockdir
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
