Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29616/src/backends/monet5
Modified Files:
sql_scenario.mx
Log Message:
propagated changes of Tuesday Sep 15 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/15 - nielsnes: src/backends/monet5/sql_scenario.mx,1.352.2.3
fixed initialization. Set 'correct' name last in startup (after sql is
properly initialized).
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/15 - mr-meltdown: src/backends/monet5/sql_scenario.mx,1.352.2.4
can simplify the code a bit now, also makes it more logical
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- sql_scenario.mx 4 Sep 2009 11:52:39 -0000 1.354
+++ sql_scenario.mx 15 Sep 2009 12:51:27 -0000 1.355
@@ -146,11 +146,11 @@
{
int res = 0;
str tmp;
- Scenario s = getFreeScenario();
+ Scenario ms, s = getFreeScenario();
if (!s)
throw(MAL, "sql.start", "out of scenario slots");
sqlinit = GDKgetenv("sqlinit");
- s->name = "sql";
+ s->name = "S_Q_L";
s->language = "sql";
s->initSystem = NULL;
s->exitSystem = "SQLexit";
@@ -159,24 +159,28 @@
s->reader = "SQLreader";
s->parser = "SQLparser";
s->engine = "SQLengine";
- if (GDKembedded)
- return SQLinit();
+ if (GDKembedded) {
+ tmp = SQLinit();
+ if (tmp == MAL_SUCCEED)
+ s->name = "sql";
+ return tmp;
+ }
- s = getFreeScenario();
- if (!s)
+ ms = getFreeScenario();
+ if (!ms)
throw(MAL, "sql.start", "out of scenario slots");
- s->name = "msql";
- s->language = "msql";
- s->initSystem = NULL;
- s->exitSystem = "SQLexit";
- s->initClient = "SQLinitClient";
- s->exitClient = "SQLexitClient";
- s->reader = "MALreader";
- s->parser = "MALparser";
- s->optimizer = "MALoptimizer";
- /* s->tactics = .. */
- s->engine = "MALengine";
+ ms->name = "M_S_Q_L";
+ ms->language = "msql";
+ ms->initSystem = NULL;
+ ms->exitSystem = "SQLexit";
+ ms->initClient = "SQLinitClient";
+ ms->exitClient = "SQLexitClient";
+ ms->reader = "MALreader";
+ ms->parser = "MALparser";
+ ms->optimizer = "MALoptimizer";
+ /* ms->tactics = .. */
+ ms->engine = "MALengine";
tmp = GDKgetenv("monet_welcome");
if (tmp != NULL && strcmp(tmp, "yes") == 0) {
fprintf(stdout, "# MonetDB/SQL module v" VERSION " loaded\n");
@@ -187,12 +191,12 @@
return(tmp);
/* only register availability of scenarios AFTER we are inited! */
- tmp = "sql";
- tmp = SABAOTHmarchScenario(&res, &tmp);
+ s->name = "sql";
+ tmp = SABAOTHmarchScenario(&res, &s->name);
if (tmp != MAL_SUCCEED)
return(tmp);
- tmp = "msql";
- return SABAOTHmarchScenario(&res, &tmp);
+ ms->name = "msql";
+ return SABAOTHmarchScenario(&res, &ms->name);
}
str
------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
