Update of /cvsroot/monetdb/MonetDB4/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2717/src/tools
Modified Files:
Tag: GDK-2
Mserver.mx prog.c
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/prog.c,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -d -r1.4.4.1 -r1.4.4.2
--- prog.c 28 Aug 2007 12:41:53 -0000 1.4.4.1
+++ prog.c 10 Sep 2007 14:22:51 -0000 1.4.4.2
@@ -104,7 +104,6 @@
/* needed, to prevent the MonetDB/4 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;
Index: Mserver.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/Mserver.mx,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- Mserver.mx 23 Aug 2007 13:15:31 -0000 1.10.2.1
+++ Mserver.mx 10 Sep 2007 14:22:50 -0000 1.10.2.2
@@ -383,7 +383,7 @@
if (!c)
usage(prog,debug, set, setlen);
- GDKsetenv("monet_version", VERSION);
+ GDKsetenv("monet_version", (str)MonetDBversion());
monet_hello(NULL);
static_module_init();
-------------------------------------------------------------------------
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
