Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30475
Modified Files:
merovingian_controlrunner.c
Log Message:
do not announce share for databases under maintenance
U merovingian_controlrunner.c
Index: merovingian_controlrunner.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_controlrunner.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- merovingian_controlrunner.c 9 Sep 2009 12:09:04 -0000 1.8
+++ merovingian_controlrunner.c 9 Sep 2009 12:17:21 -0000 1.9
@@ -260,7 +260,10 @@
if (strcmp(q, stats->dbname) ==
0) {
readProps(props,
stats->path);
kv = findConfKey(props,
"shared");
- if (kv->val == NULL ||
strcmp(kv->val, "no") != 0) {
+ if (stats->locked != 1
&&
+
(kv->val == NULL ||
+
strcmp(kv->val, "no") != 0))
+ {
/* we can leave
without tag, will remove all */
snprintf(buf2,
sizeof(buf2),
"LEAV %s mapi:monetdb://%s:%hu/",
@@ -302,7 +305,8 @@
"ANNC
%s%s mapi:monetdb://%s:%hu/ %d",
stats->dbname, p, _mero_hostname,
_mero_port, _mero_discoveryttl + 60);
- broadcast(buf2);
+ if (stats->locked != 1)
+ broadcast(buf2);
writeProps(props,
stats->path);
Mfprintf(_mero_ctlout,
"shared database '%s' "
"as
'%s%s'\n", stats->dbname,
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
