MonetDB: mosaic - Merge with default

Changeset: 92f0180fc6e9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92f0180fc6e9 Added Files: clients/mapiclient/dotfile.py clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h monetdb5/optimizer/Tests/flowgraph.malC monetdb5/optimi

MonetDB: mosaic - merge with default

Changeset: 65a90c4291d8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a90c4291d8 Added Files: sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.sql sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.err sql/test/BugTracker-2016/T

MonetDB: mosaic - compilation warning

Changeset: 1d72ed8aa505 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d72ed8aa505 Modified Files: monetdb5/modules/mosaic/mosaic_dictionary.c Branch: mosaic Log Message: compilation warning diffs (12 lines): diff --git a/monetdb5/modules/mosaic/mosaic_dictionary

MonetDB: oltp - Merge with default

Changeset: 790f2ac1d95e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=790f2ac1d95e Modified Files: clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out

MonetDB: protocol - Windows compilation fixes.

Changeset: e21f3b12872e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e21f3b12872e Modified Files: sql/backends/monet5/sql_result.c Branch: protocol Log Message: Windows compilation fixes. diffs (29 lines): diff --git a/sql/backends/monet5/sql_result.c b/sql/back