Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27129/src/backends/monet5/merovingian
Modified Files:
merovingian_forkmserver.c
Log Message:
propagated changes of Thursday Oct 08 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/08 - mr-meltdown:
src/backends/monet5/merovingian/merovingian_forkmserver.c,1.3.2.3
Export the URI the database is reachable from remotely to the database via
merovingian_uri GDKenvironment setting. This can be used by applications
inside the database that need to give a pointer back to themselves.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: merovingian_forkmserver.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- merovingian_forkmserver.c 1 Oct 2009 14:25:07 -0000 1.4
+++ merovingian_forkmserver.c 8 Oct 2009 12:23:12 -0000 1.5
@@ -219,11 +219,12 @@
str conffile = alloca(sizeof(char) * 512);
str dbname = alloca(sizeof(char) * 512);
str port = alloca(sizeof(char) * 24);
+ str muri = alloca(sizeof(char) * 512); /* possibly undersized */
char mydoproxy;
str nthreads = NULL;
str master = NULL;
str slave = NULL;
- str argv[21]; /* for the exec arguments */
+ str argv[23]; /* for the exec arguments */
confkeyval *ckv, *kv;
int c = 0;
@@ -275,6 +276,8 @@
snprintf(conffile, 512, "--config=%s", _mero_conffile);
snprintf(dbname, 512, "--dbname=%s", database);
snprintf(vaultkey, 512, "monet_vault_key=%s/.vaultkey",
(*stats)->path);
+ snprintf(muri, 512, "merovingian_uri=mapi:monetdb://%s:%d/%s",
+ _mero_hostname, _mero_port, database);
/* avoid this mserver binding to the same port as merovingian
* but on another interface, (INADDR_ANY ... sigh) causing
* endless redirects since 0.0.0.0 is not a valid address to
@@ -284,6 +287,7 @@
argv[c++] = conffile;
argv[c++] = dbname;
argv[c++] = "--dbinit=include sql;"; /* yep, no quotes needed!
*/
+ argv[c++] = "--set"; argv[c++] = muri;
argv[c++] = "--set"; argv[c++] = "monet_daemon=yes";
if (mydoproxy == 1) {
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
