Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15185/src/mal
Modified Files:
mal_parser.mx mal_session.mx
Log Message:
propagated changes of Wednesday Oct 17 2007 - Monday Oct 22 2007
from the MonetDB_5-2 branch to the development trunk
Index: mal_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_parser.mx,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- mal_parser.mx 3 Sep 2007 07:40:07 -0000 1.204
+++ mal_parser.mx 22 Oct 2007 10:36:02 -0000 1.205
@@ -59,7 +59,6 @@
mal_export void echoInput(Client cntxt);
mal_export void debugParser(int i);
mal_export str parseError(Client cntxt, str msg);
-mal_export void advance(Client cntxt, int length);
mal_export void skipSpace(Client cntxt);
mal_export void skipToEnd(Client cntxt);
mal_export int idLength(Client cntxt);
@@ -130,7 +129,7 @@
}
}
-INLINE void
+static INLINE void
advance(Client cntxt, int length)
{
cntxt->yycur += length;
Index: mal_session.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_session.mx,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- mal_session.mx 31 Aug 2007 16:54:23 -0000 1.143
+++ mal_session.mx 22 Oct 2007 10:36:02 -0000 1.144
@@ -240,8 +240,8 @@
*s = 0;
}
- if (database != NULL && database[0] != '\0' &&
- strcmp(database, GDKgetenv("gdk_dbname")) != 0)
+ if (!GDKembedded && database != NULL && database[0] != '\0' &&
+ strcmp(database, GDKgetenv("gdk_dbname")) != 0)
{
sabdb *stats;
str err;
@@ -295,30 +295,32 @@
return;
}
- err = SABAOTHgetMyStatus(&stats);
- if (err != MAL_SUCCEED) {
- /* this is kind of awful, but we need to get rid of this
- * message */
- fprintf(stderr, "!SABAOTHgetMyStatus: %s\n", err);
- GDKfree(err);
- GDKfree(command);
- return;
- }
-
- if (stats->locked == 1) {
- if (uid == 0) {
- stream_printf(fout, "#server is running in "
- "maintenance mode\n");
- } else {
- stream_printf(fout, "!server is running in "
- "maintenance mode, please try
again later\n");
- stream_flush(fout);
- SABAOTHfreeStatus(&stats);
+ if (!GDKembedded) {
+ err = SABAOTHgetMyStatus(&stats);
+ if (err != MAL_SUCCEED) {
+ /* this is kind of awful, but we need to get
rid of this
+ * message */
+ fprintf(stderr, "!SABAOTHgetMyStatus: %s\n",
err);
+ GDKfree(err);
GDKfree(command);
return;
}
+
+ if (stats->locked == 1) {
+ if (uid == 0) {
+ stream_printf(fout, "#server is running
in "
+ "maintenance mode\n");
+ } else {
+ stream_printf(fout, "!server is running
in "
+ "maintenance mode,
please try again later\n");
+ stream_flush(fout);
+ SABAOTHfreeStatus(&stats);
+ GDKfree(command);
+ return;
+ }
+ }
+ SABAOTHfreeStatus(&stats);
}
- SABAOTHfreeStatus(&stats);
c = MCinitClient(uid, fin, fout);
if (c == NULL) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
