Update of /cvsroot/monetdb/MonetDB5/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12343
Modified Files:
Makefile.ag monetdb5.conf.in
Log Message:
Implemented feature request #1825922, had to add pid-file key, made gdk_dbname
documentation a bit more to the point
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/Makefile.ag,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.ag 8 Nov 2007 19:14:18 -0000 1.11
+++ Makefile.ag 24 Nov 2007 14:34:42 -0000 1.12
@@ -41,5 +41,7 @@
monetdb_var_logdir = $(localstatedir)/log
monetdb_var_log_DATA =
+monetdb_var_rundir = $(localstatedir)/run
+monetdb_var_run_DATA =
monetdb_var_dbfarmdir = $(localstatedir)/$(PACKAGE)/dbfarm
monetdb_var_dbfarm_DATA =
Index: monetdb5.conf.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5.conf.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- monetdb5.conf.in 7 Sep 2007 12:26:31 -0000 1.24
+++ monetdb5.conf.in 24 Nov 2007 14:34:42 -0000 1.25
@@ -22,11 +22,10 @@
# of your data.
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
-# MonetDB can only handle one database at a time. You can specify
-# the name of the default database to use below.
-# Often, though, you should use the command line option
-# to specify the database of interest explicitly.
-gdk_dbname=demo # default database to open
+# MonetDB can only handle one database at a time. When you start an
+# mserver5 manually without specifying the database name yourself, the
+# following database name is used.
+gdk_dbname=demo
# The options below deal with various aspects of memory usage behaviour.
# If you don't know what these values mean, you should leave them alone.
@@ -129,6 +128,11 @@
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
#
+# Merovingian forks itself to detach into the background. It stores its
+# pid in the following file, which can be used to stop Merovingian
+# again.
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+#
# Log messages may not be instantly logged, because the process that
# writes the message does not flush its buffered stream. Since
# Merovingian cannot force other processes to flush their output, the
-------------------------------------------------------------------------
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
