Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19111/src/backends/monet5
Modified Files:
Tag: Aug2009
sql_optimizer.mx sql_scenario.mx
Log Message:
some steps to get the embedded sql working again.
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.352.2.1
retrieving revision 1.352.2.2
diff -u -d -r1.352.2.1 -r1.352.2.2
--- sql_scenario.mx 7 Aug 2009 14:26:03 -0000 1.352.2.1
+++ sql_scenario.mx 3 Sep 2009 21:26:08 -0000 1.352.2.2
@@ -160,7 +160,7 @@
s->parser = "SQLparser";
s->engine = "SQLengine";
if (GDKembedded)
- return MAL_SUCCEED;
+ return SQLinit();
s = getFreeScenario();
if (!s)
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.226
retrieving revision 1.226.2.1
diff -u -d -r1.226 -r1.226.2.1
--- sql_optimizer.mx 20 Jul 2009 13:56:34 -0000 1.226
+++ sql_optimizer.mx 3 Sep 2009 21:26:07 -0000 1.226.2.1
@@ -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
