Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16877
Modified Files:
merovingian.mx
Log Message:
Revert accidential checkin of work in progress
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- merovingian.mx 30 Sep 2008 12:43:31 -0000 1.55
+++ merovingian.mx 30 Sep 2008 12:45:14 -0000 1.56
@@ -362,7 +362,6 @@
int pfdo[2];
int pfde[2];
dpair dp = topdp;
- str vaultkey = NULL;
er = SABAOTHgetStatus(stats, database);
if (er != MAL_SUCCEED) {
@@ -463,11 +462,6 @@
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) {
@@ -487,6 +481,7 @@
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;
-------------------------------------------------------------------------
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
