Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27498/src/tools
Modified Files:
Tag: GDK-2
Mserver.mx
Log Message:
propagated changes of Tuesday Aug 14 2007 - Wednesday Aug 15 2007
from the development trunk to the GDK-2 branch
Index: Mserver.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/Mserver.mx,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -d -r1.13 -r1.13.4.1
--- Mserver.mx 14 Mar 2007 23:55:23 -0000 1.13
+++ Mserver.mx 15 Aug 2007 22:23:46 -0000 1.13.4.1
@@ -67,7 +67,7 @@
#endif /* _MONET_GLOBAL_H_ */
@c
-#include "monetdb4_config.h"
+#include "pf_config.h"
#include "Mserver.h"
#ifdef _CRTDBG_MAP_ALLOC
@@ -167,9 +167,11 @@
if ((p = mo_find_option(set, setlen, "gdk_debug")))
GDKdebug = strtol(p, NULL, 10);
- if ((p = mo_find_option(set, setlen, "gdk_mem_pagebits"))) {
+ if ((p = mo_find_option(set, setlen, "gdk_mem_pagebits")))
GDK_mem_pagebits = strtol(p, NULL, 10);
- }
+
+ if ((p = mo_find_option(set, setlen, "gdk_vmtrim")))
+ GDK_vm_trim = strcasecmp(p, "yes") == 0;
/* determine Monet's kernel settings. */
if (!GDKinit(dbname, dbfarm, strcasecmp(alloc_map, "yes") == 0)) {
@@ -292,8 +294,11 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog, debug, set, setlen);
+/* * MONETDBPREFIX & MONETDBCONFIG are not (yet?) available for sql;
+ * use "Mserver --config=`monetdb4-config --sysconfdir`/MonetDB.conf",
instead.
setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
+*/
for (;;) {
int option_index = 0;
@@ -333,9 +338,10 @@
setlen = mo_add_option(&set, setlen, opt_cmdline,
"config", optarg);
break;
case 'd':
- debug = 1;
if (optarg) {
setlen = mo_add_option(&set, setlen,
opt_cmdline, "gdk_debug", optarg);
+ } else {
+ debug = 1;
}
break;
case 's':{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
