Changeset: ed9826836ecd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed9826836ecd
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (38 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -310,9 +310,9 @@ dump_foreign_keys(Mapi mid, const char *
pkeys = malloc(nkeys * sizeof(*pkeys));
if (fkeys == NULL || pkeys == NULL) {
if (fkeys)
- free(fkeys);
+ free((void *) fkeys);
if (pkeys)
- free(pkeys);
+ free((void *) pkeys);
goto bailout;
}
pkeys[nkeys - 1] = c_pcolumn;
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2559,8 +2559,8 @@ doFile(Mapi mid, stream *fp, bool useins
" t.name,\n"
" s.name || '.' ||
t.name AS fullname,\n"
" CAST(CASE
t.type\n"
- " WHEN 1 THEN 2 --
ntype for views\n"
- " ELSE 1\t --
ntype for tables\n"
+ " WHEN 1 THEN 2\n"
/* ntype for views */
+ " ELSE 1\n" /*
ntype for tables */
" END AS SMALLINT)
AS ntype,\n"
" (CASE WHEN
t.system THEN 'SYSTEM ' ELSE '' END) || tt.table_type_name AS type,\n"
" t.system,\n"
@@ -2581,7 +2581,7 @@ doFile(Mapi mid, stream *fp, bool useins
" LEFT OUTER JOIN
comments c ON sq.id = c.id\n"
" LEFT OUTER JOIN
sys.schemas s ON sq.schema_id = s.id\n"
" UNION ALL\n"
- " SELECT DISTINCT
s.name AS sname, -- DISTINCT is needed to filter out duplicate overloaded
function/procedure names\n"
+ " SELECT DISTINCT
s.name AS sname,\n" /* DISTINCT is needed to filter out duplicate overloaded
function/procedure names */
" f.name,\n"
" s.name || '.' ||
f.name AS fullname,\n"
" CAST(8 AS
SMALLINT) AS ntype,\n"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
