Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs16:/tmp/cvs-serv3165/src/tools
Modified Files:
embeddedclient.mx prog.c
Log Message:
propagated changes of Thursday Apr 12 2007 - Friday Apr 27 2007
from the XQuery_0-16 branch to the development trunk
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/embeddedclient.mx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- embeddedclient.mx 2 Mar 2007 12:35:44 -0000 1.12
+++ embeddedclient.mx 27 Apr 2007 09:46:00 -0000 1.13
@@ -169,7 +169,6 @@
snprintf(buf, sizeof(buf), "client(Stream(\"" PTRFMT "\"), Stream(\""
PTRFMT "\"));", PTRFMTCAST in, PTRFMTCAST out);
monet_exec("module(pathfinder);");
monet_exec("xquery_start_query_cache(16000000LL);");
-/* monet_exec("mapi_register(xquery_frontend());"); */
monet_exec(buf);
return NULL;
}
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/prog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- prog.c 3 Jan 2007 12:33:14 -0000 1.11
+++ prog.c 27 Apr 2007 09:46:00 -0000 1.12
@@ -16,7 +16,7 @@
* All Rights Reserved.
*/
-#include "pf_config.h"
+#include "monetdb4_config.h"
#include <monet_options.h>
#include "embeddedclient.h"
@@ -101,6 +101,11 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog);
+ /* needed, to prevent the MonetDB config file to be 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;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
