MonetDB: default - Merge with Oct2010 branch.

[Stefan Manegold]

Changeset: 6f6f6c5a6df1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f6f6c5a6df1
Modified Files:
        sql/src/backends/monet5/sql_optimizer.mx
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (12 lines):

diff -r 598e7cf5683f -r 6f6f6c5a6df1 sql/src/backends/monet5/sql_optimizer.mx
--- a/sql/src/backends/monet5/sql_optimizer.mx  Thu Oct 07 08:38:28 2010 +0200
+++ b/sql/src/backends/monet5/sql_optimizer.mx  Thu Oct 07 09:19:32 2010 +0200
@@ -640,7 +640,7 @@
        for (i = 0; optimizers[i]; i++) {
                InstrPtr p;
 
-               if (m->point_query && strcmp(optimizers[i], "mitosis")==0) 
+               if (m->point_query && (strcmp(optimizers[i], "mitosis")==0 || 
strcmp(optimizers[i], "dataflow")==0))
                        continue;
                p = newFcnCall(mb, "optimizer", optimizers[i]);
                typeChecker(c->nspace, mb, p, TRUE);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list