Changeset: 25b8b2df4373 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25b8b2df4373
Modified Files:
monetdb5/modules/mal/remote.c
Branch: monetdbe-proxy
Log Message:
Fix a couple of regressions.
diffs (21 lines):
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -246,7 +246,7 @@ static str RMTconnectScen(
return msg;
}
- if (*columnar) {
+ if (columnar && *columnar) {
char set_protocol_query_buf[50];
snprintf(set_protocol_query_buf, 50,
"sql.set_protocol(%d:int);", PROTOCOL_COLUMNAR);
if ((msg = RMTquery(&hdl, "remote.connect", m,
set_protocol_query_buf)))
@@ -1609,7 +1609,7 @@ mel_func remote_init_funcs[] = {
command("remote", "prelude", RMTprelude, false, "initialise the remote
module", args(1,1, arg("",void))),
command("remote", "epilogue", RMTepilogue, false, "release the resources held
by the remote module", args(1,1, arg("",void))),
command("remote", "resolve", RMTresolve, false, "resolve a pattern against
Merovingian and return the URIs", args(1,2, batarg("",str),arg("pattern",str))),
- command("remote", "connect", RMTconnect, false, "returns a newly created
connection for uri, using user name and password", args(1,4,
arg("",str),arg("uri",str),arg("user",str),arg("passwd",str))),
+ command("remote", "connect", RMTconnect, false, "returns a newly created
connection for uri, using user name and password", args(1,5,
arg("",str),arg("uri",str),arg("user",str),arg("passwd",str),arg("scen",str))),
command("remote", "connect", RMTconnectScen, false, "returns a newly created
connection for uri, using user name, password and scenario", args(1,6,
arg("",str),arg("uri",str),arg("user",str),arg("passwd",str),arg("scen",str),arg("columnar",bit))),
pattern("remote", "connect", RMTconnectTable, false, "return a newly created
connection for a table. username and password should be in the vault",
args(1,3, arg("",str),arg("table",str),arg("schen",str))),
command("remote", "disconnect", RMTdisconnect, false, "disconnects the
connection pointed to by handle (received from a call to connect()", args(1,2,
arg("",void),arg("conn",str))),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
