Changeset: 25792d37b638 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25792d37b638
Modified Files:
monetdb5/mal/mal_import.c
Branch: Nov2019
Log Message:
Send output to correct recipient when using language.call().
diffs (27 lines):
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -425,7 +425,7 @@ callString(Client cntxt, str s, int list
GDKfree(qry);
throw(MAL,"callstring", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
- c= MCinitClient((oid)0, bs,0);
+ c= MCinitClient((oid)0, bs, cntxt->fdout);
if( c == NULL){
GDKfree(b);
GDKfree(qry);
@@ -448,10 +448,13 @@ callString(Client cntxt, str s, int list
c->usermodule = 0;
GDKfree(b);
GDKfree(qry);
+ c->fdout = GDKstdout;
MCcloseClient(c);
return msg;
}
- if((msg = runScenario(c,1)) != MAL_SUCCEED) {
+ msg = runScenario(c,1);
+ c->fdout = GDKstdout;
+ if (msg != MAL_SUCCEED) {
c->usermodule = 0;
GDKfree(b);
GDKfree(qry);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
