Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18147
Modified Files:
merovingian.mx
Log Message:
avoid a message telling that the sql scenario isn't initialised yet by waiting
for it to have loaded
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- merovingian.mx 28 Oct 2008 11:54:34 -0000 1.68
+++ merovingian.mx 28 Oct 2008 12:16:59 -0000 1.69
@@ -566,9 +566,17 @@
}
if ((*stats)->state == SABdbRunning &&
(*stats)->conns != NULL &&
- (*stats)->conns->val != NULL)
+ (*stats)->conns->val != NULL &&
+ (*stats)->scens != NULL &&
+ (*stats)->scens->val != NULL)
{
- break;
+ sablist *scen = (*stats)->scens;
+ do {
+ if (scen->val != NULL &&
strcmp(scen->val, "sql") == 0)
+ break;
+ } while ((scen = scen->next) != NULL);
+ if (scen != NULL)
+ break;
}
}
/* if we've never found a connection, try to figure out why */
@@ -591,7 +599,8 @@
pdp->next = NULL;
return(newErr(
"timeout when
waiting for database '%s' to "
- "open up a
communication channel", database));
+ "open up a
communication channel or to "
+ "initialise the
sql scenario", database));
case SABdbCrashed:
/* remove from the list again */
GDKfree(dp->dbname);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
