MonetDB: Jul2017 - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: cc521978dbff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc521978dbff
Modified Files:
        monetdb5/modules/mal/remote.c
Branch: Jul2017
Log Message:

Merge with Dec2016 branch.


diffs (12 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
@@ -758,7 +758,7 @@ str RMTput(Client cntxt, MalBlkPtr mb, M
                        l = ATOMformat(type, value, &val);
                }
                tpe = getTypeIdentifier(type);
-               l += strlen(tpe) + strlen(ident) + 10;
+               l += (int) (strlen(tpe) + strlen(ident) + 10);
                if (l > BUFSIZ)
                        nbuf = GDKmalloc(l);
                if (type <= TYPE_str)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list