MonetDB: default - Ensure existence of return variables.

[Martin Kersten]

Changeset: 1b74419727da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b74419727da
Modified Files:
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:

Ensure existence of return variables.


diffs (23 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
@@ -86,7 +86,7 @@ SQLsetTrace(Client cntxt, MalBlkPtr mb)
        q= pushStr(mb,q,"sql_traces");
        /* cook a new resultSet instruction */
        resultset = newInstruction(mb,sqlRef, resultSetRef);
-       setVarType(mb, getArg(resultset,0), TYPE_int);
+       getArg(resultset,0) = newTmpVariable(mb, TYPE_int);
 
        /* build table defs */
        tbls = newStmt(mb,batRef, newRef);
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -319,6 +319,7 @@ static int
 
        /* remote.exec(q, "sql", "register", "mod", "name", "relational_plan", 
"signature"); */
        p = newInstruction(curBlk, remoteRef, execRef);
+       getArg(p,0) = newTmpVariable(curBlk,TYPE_any);
        p = pushArgument(curBlk, p, q);
        p = pushStr(curBlk, p, sqlRef);
        p = pushStr(curBlk, p, registerRef);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list