Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30674/src/backends/monet5
Modified Files:
sql_optimizer.mx
Log Message:
propagated changes of Thursday Sep 03 2009 - Friday Sep 04 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/03 - nielsnes: src/backends/monet5/sql_optimizer.mx,1.226.2.1
some steps to get the embedded sql working again.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- sql_optimizer.mx 20 Jul 2009 13:56:34 -0000 1.226
+++ sql_optimizer.mx 4 Sep 2009 11:52:34 -0000 1.227
@@ -441,7 +441,7 @@
Additional pipelines are defined in the monetdb.conf file.
@c
str minimalPlan= "inline,remap,deadcode,multiplex";
-str defaultPlan;
+str defaultPlan = NULL;
static str optimizers[256]; /* the optimizer pipeline */
static str optimizerpipeline; /* reference to last pipeline string */
@@ -525,7 +525,7 @@
if (top == 256)
showException(SQL,"optimizer","Too many optimizer steps\n");
if (SQLvalidatePipeline() ) {
- if (optimizerpipeline == defaultPlan)
+ if (optimizerpipeline == defaultPlan || !defaultPlan)
setOptimizers(minimalPlan);
else
setOptimizers(defaultPlan);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
