Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18577/MonetDB5/src/tools
Modified Files:
prog.c
Log Message:
make sure we (try to) read config files only after we have seen the commandline
options
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/prog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- prog.c 29 Aug 2007 07:43:16 -0000 1.9
+++ prog.c 7 Sep 2007 21:59:09 -0000 1.10
@@ -104,7 +104,6 @@
/* needed to prevent the MonetDB config file from being used */
setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
- setlen = mo_system_config(&set, setlen);
for (;;) {
int option_index = 0;
@@ -158,6 +157,8 @@
}
}
+ setlen = mo_system_config(&set, setlen);
+
mid = embedded_mal(set, setlen);
/* now for each file given on the command line (or stdin)
-------------------------------------------------------------------------
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
