Changeset: c063b23d31a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c063b23d31a2
Modified Files:
        monetdb5/mal/mal_interpreter.c
Branch: Sep2022
Log Message:

Take query control check for pause or quit out of NDEBUG if.


diffs (33 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
@@ -558,17 +558,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);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to