MonetDB: default - fix small merge issues

2017-12-05 Thread Niels Nes
Changeset: 2df455b042a7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2df455b042a7 Modified Files: sql/server/rel_select.c Branch: default Log Message: fix small merge issues diffs (33 lines): diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/

MonetDB: Jul2017 - Force evaluation order.

2017-12-05 Thread Sjoerd Mullender
Changeset: 9eadb74d71c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9eadb74d71c5 Modified Files: gdk/gdk_aggr.c Branch: Jul2017 Log Message: Force evaluation order. For some reason, the 32-bit version on Fedora didn't do it the way we wanted. diffs (28 lines):

MonetDB: Jul2017 - Approve single-threaded output.

2017-12-05 Thread Sjoerd Mullender
Changeset: f5e1cb36b426 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5e1cb36b426 Modified Files: monetdb5/optimizer/Tests/manifold2.stable.out.single Branch: Jul2017 Log Message: Approve single-threaded output. diffs (57 lines): diff --git a/monetdb5/optimizer

MonetDB: Jul2017 - Approve 32 bit output.

2017-12-05 Thread Sjoerd Mullender
Changeset: 7d6fc14af049 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d6fc14af049 Added Files: sql/backends/monet5/Tests/pyloader06.stable.out.32bit sql/backends/monet5/Tests/pyloader07.stable.out.32bit Branch: Jul2017 Log Message: Approve 32 bit output.

MonetDB: Jul2017 - Approved after changeset fa09cb21a5c8.

2017-12-05 Thread Sjoerd Mullender
Changeset: 5f2955eb36b8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f2955eb36b8 Modified Files: sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/12.stable.out sql/benchmarks/tpch/LOCKED/Tests/16.stable.out

MonetDB: data-vaults - Merge with default

2017-12-05 Thread Panagiotis Koutsourakis
Changeset: 132fb27dcffd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=132fb27dcffd Added Files: sql/test/BugTracker-2017/Tests/function-resolution.Bug-6436.sql sql/test/BugTracker-2017/Tests/function-resolution.Bug-6436.stable.err sql/test/BugTracker

MonetDB: Jul2017 - Approve 32 bit output.

2017-12-05 Thread Sjoerd Mullender
Changeset: 46d035c973b1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46d035c973b1 Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: Jul2017 Log Message: Approve 32 bit output. diffs (23 lines): diff --git a/sql/test/emptydb/Tests/check.stabl