Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2362/src/server
Modified Files:
sql_env.mx
Log Message:
propagated changes of Friday Oct 23 2009 - Saturday Oct 24 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/server/sql_env.mx,1.79.8.2
Detect also the omission of an optimizer pipe.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/server/sql_env.mx,1.79.8.3
Backward compatible use of optimizer='off'
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_env.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_env.mx,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- sql_env.mx 22 Oct 2009 10:57:38 -0000 1.80
+++ sql_env.mx 23 Oct 2009 22:43:53 -0000 1.81
@@ -118,8 +118,11 @@
return sql_message( "Cannot activate history because
the keepQuery and keepCall procedures are not available\n" );
m->history = (int) (sgn)?1:0;
} else if (strcmp(name, "optimizer") == 0) {
- str pipe=GDKgetenv(stack_get_string(m,"optimizer"));
- if ( pipe == NULL)
+ str optimizer =stack_get_string(m,"optimizer");
+ str pipe=GDKgetenv(optimizer);
+ if ( optimizer == NULL || *optimizer == 0)
+ return NULL;
+ if ( pipe == NULL && strcmp(optimizer,"off"))
return sql_message( "Optimizer pipeline not known\n");
}
return NULL;
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
