Changeset: ac6c2be80968 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac6c2be80968
Modified Files:
common/options/monet_options.mx
gdk/gdk.mx
gdk/gdk_utils.mx
monetdb5/mal/mal.mx
Branch: default
Log Message:
monetdb5.conf is gone; remove it from comments & documentation
diffs (82 lines):
diff --git a/common/options/monet_options.mx b/common/options/monet_options.mx
--- a/common/options/monet_options.mx
+++ b/common/options/monet_options.mx
@@ -296,11 +296,6 @@
if (set == NULL)
return 0;
- /* -------------------------------------------------------------- */
- /* Please keep the below defaults aligned with the comments in */
- /* monetdb5/misc/monetdb5.conf.in */
- /* -------------------------------------------------------------- */
-
set[i].kind = opt_builtin;
set[i].name = strdup("gdk_dbname");
set[i].value = strdup("demo");
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -2579,7 +2579,7 @@
gdk_export MT_Lock GDKtmLock;
/*
- See `man monetdb5.conf` or MonetDB5/conf/monetdb5.conf.5
+ See `man mserver5` or tools/mserver/mserver5.1
for a documentation of the following debug options.
*/
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -83,9 +83,8 @@
@}
@+ Monet configuration file
-Parse a possible MonetDB.conf file (either in the default location
-<prefix>/etc/MonetDB.conf, or as specified by either an environment variable
-$MONETDB_CONFIG, or by command line option -c/--config)
+Parse a possible MonetDB config file
+(if specified by command line option -c/--config)
to extract pre-settings of system variables.
Un-recognized parameters are simply skipped, because they may be
picked up by other components of the system.
@@ -94,7 +93,7 @@
Syntax errors are immediately flagged, though.
Since the GDK kernel moves into the database directory, we need
-to keep the absolute path to the MonetDB.conf file for top-levels
+to keep the absolute path to the MonetDB config file for top-levels
to access its information.
@{
@c
@@ -384,7 +383,7 @@
size_t GDK_mmap_minsize = GDK_VM_MAXSIZE;
size_t GDK_mem_maxsize_max = GDK_VM_MAXSIZE;
size_t GDK_mem_maxsize = GDK_VM_MAXSIZE;
-size_t GDK_mem_bigsize = 1 << 20; /* please keep in sync with MonetDB.conf.in
& monetdb5.conf.in */
+size_t GDK_mem_bigsize = 1 << 20;
size_t GDK_vm_maxsize = GDK_VM_MAXSIZE;
int GDK_vm_allocs = 0;
diff --git a/monetdb5/mal/mal.mx b/monetdb5/mal/mal.mx
--- a/monetdb5/mal/mal.mx
+++ b/monetdb5/mal/mal.mx
@@ -194,7 +194,8 @@
@+ Monet Calling Options
The number of invocation arguments is kept to a minimum.
-See the monetdb5.conf file for additional system variable settings
+See `man mserver5` or tools/mserver/mserver5.1
+for additional system variable settings.
@
@h
#define MAXSCRIPT 64
@@ -212,7 +213,7 @@
/*
See gdk/gdk.mx for the definition of all debug masks.
- See `man monetdb5.conf` or MonetDB5/conf/monetdb5.conf.5
+ See `man mserver5` or tools/mserver/mserver5.1
for a documentation of all debug options.
*/
#define GRPthreads ( 1 | PARMASK)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
