MonetDB: oltp - Merge with default

Changeset: 21be4e42cb7d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21be4e42cb7d Modified Files: clients/Tests/exports.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/mal.c monetdb5/mal/mal.h

MonetDB: default - Use proper module name.

Changeset: 99d5abc121bb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d5abc121bb Modified Files: monetdb5/optimizer/opt_candidates.c Branch: default Log Message: Use proper module name. diffs (24 lines): diff --git a/monetdb5/optimizer/opt_candidates.c b/monet