Changeset: 6359474c4907 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6359474c4907
Modified Files:
sql/backends/monet5/sql_execute.c
sql/backends/monet5/wlr.c
Branch: default
Log Message:
Fix trace queries by setting variable scope before running MAL block
diffs (36 lines):
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -238,17 +238,20 @@ SQLrun(Client c, mvc *m)
#ifdef NDEBUG
msg = createException(SQL,"sql.statement",SQLSTATE(HY000)
"DEBUG requires compilation for debugging");
#else
+ setVariableScope(mb);
msg = runMALDebugger(c, mb);
#endif
} else {
if( m->emod & mod_trace){
if((msg = SQLsetTrace(c,mb)) == MAL_SUCCEED) {
+ setVariableScope(mb);
c->idle = 0;
c->lastcmd = time(0);
msg = runMAL(c, mb, 0, 0);
stopTrace(c);
}
} else {
+ setVariableScope(mb);
c->idle = 0;
c->lastcmd = time(0);
msg = runMAL(c, mb, 0, 0);
diff --git a/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -354,6 +354,8 @@ WLRprocessBatch(Client cntxt)
msg = chkFlow(mb);
if (!msg)
msg = chkDeclarations(mb);
+ if (!msg)
+ setVariableScope(mb);
wlr_tag = tag; // remember which transaction
we executed
snprintf(wlr_read, sizeof(wlr_read), "%s",
tag_read);
if(!msg && mb->errors == 0){
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
