Changeset: 7daf6f57cc93 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7daf6f57cc93
Modified Files:
monetdb5/optimizer/opt_pipes.c
Branch: xid
Log Message:
Fixed merge error.
diffs (12 lines):
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -106,8 +106,6 @@ struct PIPELINES {
"optimizer.multiplex();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
- "optimizer.garbageCollector();",
- "stable", NULL, NULL, 1},
/* The no_mitosis pipe line is (and should be kept!) identical to the
* default pipeline, except that optimizer mitosis is omitted. It is
* used mainly to make some tests work deterministically, and to check
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
