MonetDB: default - mserver5: do not read monetdb5.conf by default

[Fabian Groffen]

Changeset: 5d968e6efc43 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d968e6efc43
Modified Files:
        tools/mserver/mserver5.mx
Branch: default
Log Message:

mserver5: do not read monetdb5.conf by default


diffs (37 lines):

diff --git a/tools/mserver/mserver5.mx b/tools/mserver/mserver5.mx
--- a/tools/mserver/mserver5.mx
+++ b/tools/mserver/mserver5.mx
@@ -38,7 +38,7 @@
     --dbname=<database_name>  Specify database name
     --dbfarm=<directory>      Specify database location
     --dbinit=<stmt>           Execute statement at startup
-    --config=<config_file>    Specify location of configuration file
+    --config=<config_file>    Use configuration to read options
     --daemon=yes|no           Do not read commands from standard input [no]
     --single-user             Allow only one user at a time
     --readonly                Safeguard database
@@ -148,7 +148,7 @@
        fprintf(stderr, "    --dbname=<database_name>  Specify database 
name\n");
        fprintf(stderr, "    --dbfarm=<directory>      Specify database 
location\n");
        fprintf(stderr, "    --dbinit=<stmt>           Execute statement at 
startup\n");
-       fprintf(stderr, "    --config=<config_file>    Specify location of 
configuration file\n");
+       fprintf(stderr, "    --config=<config_file>    Use config_file to read 
options from\n");
        fprintf(stderr, "    --daemon=yes|no           Do not read commands 
from standard input [no]\n");
        fprintf(stderr, "    --single-user             Allow only one user at a 
time\n");
        fprintf(stderr, "    --readonly                Safeguard database\n");
@@ -209,7 +209,6 @@
        printf("# Found %.3f %ciB available main-memory.\n", 
                        sz_mem_h, qc[qi]);
 #ifdef MONET_GLOBAL_DEBUG
-       printf("# Configuration:%s\n", GDKgetenv("config"));
        printf("# Database farm:%s\n", GDKgetenv("gdk_dbfarm"));
        printf("# Module path:%s\n", GDKgetenv("monet_mod_path"));
 #endif
@@ -397,7 +396,6 @@
                usage(prog);
 
        setlen = mo_add_option(&set, setlen, opt_config, "prefix", PREFIX);
-       setlen = mo_add_option(&set, setlen, opt_config, "config", 
MONETDB5_CONFFILE);
 
        for (;;) {
                int option_index = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list