Changeset: 51cc9a9862a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51cc9a9862a1
Modified Files:
clients/mapiclient/mclient.c
monetdb5/modules/mal/joinpath.c
Branch: default
Log Message:
merged
diffs (24 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -910,7 +910,7 @@ TESTrenderer(MapiHdl hdl)
mnstr_printf(toConsole, "%s", sep);
sep = ",\t";
if (s == NULL)
- mnstr_printf(toConsole, mode == SQL ? "NULL" :
"nil");
+ mnstr_printf(toConsole, "%s", mode == SQL ?
"NULL" : "nil");
else if (strcmp(tp, "varchar") == 0 ||
strcmp(tp, "char") == 0 ||
strcmp(tp, "clob") == 0 ||
diff --git a/monetdb5/modules/mal/joinpath.c b/monetdb5/modules/mal/joinpath.c
--- a/monetdb5/modules/mal/joinpath.c
+++ b/monetdb5/modules/mal/joinpath.c
@@ -305,7 +305,7 @@ ALGjoinPath(Client cntxt, MalBlkPtr mb,
for( --top; top>=0; top--)
BBPunfix(joins[top]->batCacheid);
GDKfree(joins);
- throw(MAL, "algebra.joinPath", error?
SEMANTIC_TYPE_MISMATCH: INTERNAL_BAT_ACCESS);
+ throw(MAL, "algebra.joinPath", "%s", error?
SEMANTIC_TYPE_MISMATCH: INTERNAL_BAT_ACCESS);
}
joins[top++] = b;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
