Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30119
Modified Files:
merovingian.mx monetdb.mx
Log Message:
merovingian: a database may be running, but we can't kill it if it's not
under our control, so don't claim it doesn't exist
monetdb: report the database already being started instead of the first
from the command line
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/merovingian.mx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- merovingian.mx 10 Sep 2007 07:46:38 -0000 1.47
+++ merovingian.mx 10 Sep 2007 11:02:20 -0000 1.48
@@ -921,7 +921,8 @@
}
if (dp == NULL) {
fprintf(stderr, "control stop signal
for "
- "non-existing database:
%s\n", buf);
+ "database not under
merovingian control: %s\n",
+ buf);
}
} else {
fprintf(stderr, "unknown control command: %s",
p);
Index: monetdb.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/monetdb.mx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- monetdb.mx 10 Sep 2007 09:41:05 -0000 1.35
+++ monetdb.mx 10 Sep 2007 11:02:21 -0000 1.36
@@ -571,7 +571,7 @@
printf("%s: database is not running:
%s\n", type, argv[i]);
} else if (mode == START && stats->state ==
SABdbRunning) {
printf("%s: database is already
running: %s\n",
- type, argv[1]);
+ type, argv[i]);
} else {
snprintf(buf, 256, "%s %s\n",
stats->dbname, type);
fputs(buf, f);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
