Changeset: e682b9e3510e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e682b9e3510e Modified Files: monetdb5/modules/mal/mal_init.mal Branch: sciql Log Message:
Merge with default branch. diffs (11 lines): diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c --- a/monetdb5/optimizer/opt_support.c +++ b/monetdb5/optimizer/opt_support.c @@ -591,7 +591,6 @@ {"multiplex", 0, 0, 0, DEBUG_OPT_MULTIPLEX}, {"octopus", 0, 0, 0, DEBUG_OPT_OCTOPUS}, {"origin", 0, 0, 0, DEBUG_OPT_ORIGIN}, -{"partitions", 0, 0, 0, DEBUG_OPT_PARTITIONS}, {"peephole", 0, 0, 0, DEBUG_OPT_PEEPHOLE}, {"prejoin", 0, 0, 0, DEBUG_OPT_PREJOIN}, {"pushranges", 0, 0, 0, DEBUG_OPT_PUSHRANGES}, _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list