Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27185/src/backends/monet5
Modified Files:
Tag: Aug2009
sql_scenario.mx
Log Message:
fixed initialization. Set 'correct' name last in startup (after sql is
properly initialized).
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.2
retrieving revision 1.352.2.3
diff -u -d -r1.352.2.2 -r1.352.2.3
--- sql_scenario.mx 3 Sep 2009 21:26:08 -0000 1.352.2.2
+++ sql_scenario.mx 15 Sep 2009 06:21:37 -0000 1.352.2.3
@@ -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,10 +191,12 @@
return(tmp);
/* only register availability of scenarios AFTER we are inited! */
+ s->name = "sql";
tmp = "sql";
tmp = SABAOTHmarchScenario(&res, &tmp);
if (tmp != MAL_SUCCEED)
return(tmp);
+ ms->name = "msql";
tmp = "msql";
return SABAOTHmarchScenario(&res, &tmp);
}
------------------------------------------------------------------------------
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
