Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13866
Modified Files:
merovingian.mx monetdb.mx
Log Message:
The -w (wait) flag was removed, as it has been made the default now
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- merovingian.mx 30 Aug 2008 11:17:12 -0000 1.54
+++ merovingian.mx 30 Sep 2008 12:43:31 -0000 1.55
@@ -362,6 +362,7 @@
int pfdo[2];
int pfde[2];
dpair dp = topdp;
+ str vaultkey = NULL;
er = SABAOTHgetStatus(stats, database);
if (er != MAL_SUCCEED) {
@@ -462,6 +463,11 @@
if ((*stats)->locked == 1 && force == 1)
merlog("startup of database under maintenance '%s' forced",
database);
+ /* check if the vaultkey is there, otherwise abort early (value
+ * lateron reused when server is started) */
+ vaultkey = alloca(sizeof(char) * 512);
+ snprintf(vaultkey, 511, "%s/.vaultkey", (*stats)->path);
+
/* create the pipes (filedescriptors) now, such that we and the
* child have the same descriptor set */
if (pipe(pfdo) == -1) {
@@ -481,7 +487,6 @@
if (pid == 0) {
str conffile = alloca(sizeof(char) * 512);
str dbname = alloca(sizeof(char) * 512);
- str vaultkey = alloca(sizeof(char) * 512);
str argv[13]; /* for the exec arguments */
int c = 0;
U monetdb.mx
Index: monetdb.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/monetdb.mx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- monetdb.mx 30 Aug 2008 12:15:28 -0000 1.25
+++ monetdb.mx 30 Sep 2008 12:43:31 -0000 1.26
@@ -127,21 +127,21 @@
printf(" possible from r (running), s (stopped), c
(crashed)\n");
printf(" and l (locked).\n");
} else if (strcmp(argv[1], "start") == 0) {
- printf("Usage: monetdb start [-aw] database [database ...]\n");
+ printf("Usage: monetdb start [-a] database [database ...]\n");
printf(" Starts the given database, if the MonetDB Database
Server\n");
printf(" is running.\n");
printf("Options:\n");
printf(" -a start all known databases\n");
printf(" -w wait for a database to be started instead of
returning immediately\n");
} else if (strcmp(argv[1], "stop") == 0) {
- printf("Usage: monetdb stop [-aw] database [database ...]\n");
+ printf("Usage: monetdb stop [-a] database [database ...]\n");
printf(" Stops the given database, if the MonetDB Database
Server\n");
printf(" is running.\n");
printf("Options:\n");
printf(" -a stop all known databases\n");
printf(" -w wait for a database to be stopped instead of
returning immediately\n");
} else if (strcmp(argv[1], "kill") == 0) {
- printf("Usage: monetdb kill [-aw] database [database ...]\n");
+ printf("Usage: monetdb kill [-a] database [database ...]\n");
printf(" Kills the given database, if the MonetDB Database
Server\n");
printf(" is running. Note: killing a database should only be
done\n");
printf(" as last resort to stop a database. A database
being\n");
-------------------------------------------------------------------------
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
