Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8313
Modified Files:
merovingian.mx
Log Message:
Also the control file should be in a location different from dbfarm.
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- merovingian.mx 12 Oct 2008 14:48:37 -0000 1.60
+++ merovingian.mx 12 Oct 2008 15:12:42 -0000 1.61
@@ -2094,7 +2094,12 @@
SABAOTHinit(dbfarm, NULL);
/* set up control channel path */
- snprintf(buf, 1024, "%s/.merovingian_control", dbfarm);
+ strcpy(buf, pidfilename);
+ c= strrchr(buf,'/');
+ if (c)
+ strcpy(c+1,".merovingian_control");
+ else
+ strcpy(buf, ".merovingian_control");
unlink(buf);
GDKfree(dbfarm);
-------------------------------------------------------------------------
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
