MonetDB: default - Merge with Jan2014 branch.

Changeset: 409d381226f2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=409d381226f2 Added Files: sql/test/Tests/alastair_udf_mergetable_bug.py sql/test/Tests/alastair_udf_mergetable_bug.stable.err sql/test/Tests/alastair_udf_mergetable_bug.stable.out M

MonetDB: Jan2014 - Approved after changeset 1c8236cd17fc.

Changeset: 8aa43f5b77ca for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8aa43f5b77ca Modified Files: monetdb5/tests/BugTracker/Tests/parser.SF-2051309.stable.out sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err Branch: J

MonetDB: default - Avoid dereference through null

Changeset: 60744fddaeff for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60744fddaeff Modified Files: monetdb5/modules/mal/manifold.c Branch: default Log Message: Avoid dereference through null diffs (12 lines): diff --git a/monetdb5/modules/mal/manifold.c b/monetdb

MonetDB: rdf - Change the priority in choosing name.

Changeset: 654b3064edbb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=654b3064edbb Modified Files: monetdb5/extras/rdf/ontmetadata/loadOntologyToMonetDB.sh monetdb5/extras/rdf/ontmetadata/ontAttribute.ogp.csv monetdb5/extras/rdf/ontmetadata/ontAttribu

MonetDB: rdf - Select better ontology-based name according to th...

Changeset: b78f7d587b19 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b78f7d587b19 Modified Files: monetdb5/extras/rdf/ontmetadata/ontAttribute.ogp.csv monetdb5/extras/rdf/ontmetadata/ontMetadata.ogp.csv monetdb5/extras/rdf/rdflabels.c monetdb

MonetDB: Jan2014 - Approve output after change of handling MAL e...

Changeset: 260b1cf76741 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=260b1cf76741 Modified Files: monetdb5/mal/Tests/tst013.stable.out monetdb5/mal/Tests/tst036.stable.out monetdb5/mal/Tests/tst050.stable.out monetdb5/mal/Tests/tst070.stable.

MonetDB: Jan2014 - Add test for the bug in mergetable to deal wi...

Changeset: f0127058adfb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0127058adfb Added Files: sql/test/Tests/alastair_udf_mergetable_bug.py sql/test/Tests/alastair_udf_mergetable_bug.stable.err sql/test/Tests/alastair_udf_mergetable_bug.stable.out B

MonetDB: Jan2014 - Remove default --set options that get overwri...

Changeset: 986252d7507d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=986252d7507d Modified Files: testing/process.py Branch: Jan2014 Log Message: Remove default --set options that get overwritten by the caller. diffs (17 lines): diff --git a/testing/process.py b

MonetDB: Jan2014 - Make mserver5 compile with --enable-console=no

Changeset: 64569cb0820c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64569cb0820c Modified Files: tools/mserver/mserver5.c Branch: Jan2014 Log Message: Make mserver5 compile with --enable-console=no diffs (13 lines): diff --git a/tools/mserver/mserver5.c b/tools