Changeset: 75299b22713b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75299b22713b
Modified Files:
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/Makefile.ag
Branch: default
Log Message:
Merge heads.
diffs (40 lines):
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -133,7 +133,6 @@
include opt_reorder;
include opt_octopus;
include opt_origin;
-include opt_partitions;
include opt_peephole;
include opt_prejoin;
include opt_qep;
@@ -142,7 +141,7 @@
include opt_reduce;
include opt_remap;
include opt_recycler;
-include opt_slicing;
+include opt_partition;
include opt_singleton;
include opt_strengthReduction;
include opt_statistics;
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -58,7 +58,6 @@
opt_multiplex.mx \
opt_octopus.mx \
opt_origin.mx \
- opt_partitions.mx \
opt_peephole.mx \
opt_pipes.c \
opt_prejoin.mx \
@@ -88,7 +87,7 @@
opt_coercion.mx opt_emptySet.mx opt_peephole.mx
opt_multiplex.mx \
opt_singleton.mx opt_costModel.mx opt_reduce.mx opt_macro.mx \
opt_accumulators.mx opt_qep.mx opt_mergetable.mx \
- opt_remoteQueries.mx opt_joinselect.mx opt_partitions.mx \
+ opt_remoteQueries.mx opt_joinselect.mx \
opt_reorder.mx opt_prejoin.mx opt_compression.mx \
opt_evaluate.mx opt_inline.mx opt_pushranges.mx
opt_derivepath.mx \
opt_accessmode.mx opt_joinpath.mx opt_heuristics.mx
opt_remap.mx \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
