Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27525

Modified Files:
      Tag: Nov2009
        merovingian_controlrunner.c 
Log Message:
regression fix: can't set most (all but shared) properties while the database 
is running

U merovingian_controlrunner.c
Index: merovingian_controlrunner.c
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_controlrunner.c,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -d -r1.26.2.2 -r1.26.2.3
--- merovingian_controlrunner.c 29 Sep 2009 08:35:03 -0000      1.26.2.2
+++ merovingian_controlrunner.c 1 Oct 2009 09:22:06 -0000       1.26.2.3
@@ -488,6 +488,15 @@
                                                /* we're going to change the 
way it is shared,
                                                 * so remove it now in its old 
form */
                                                leavedbS(stats);
+                                       } else if (stats->state == 
SABdbRunning) {
+                                               Mfprintf(_mero_ctlerr, "%s: 
cannot set property '%s' "
+                                                               "on running 
database\n", origin, p);
+                                               len = snprintf(buf2, 
sizeof(buf2),
+                                                               "cannot set 
property '%s' on running "
+                                                               "database\n", 
p);
+                                               send(msgsock, buf2, len, 0);
+                                               SABAOTHfreeStatus(&stats);
+                                               continue;
                                        }
 
                                        if ((e = setProp(stats->path, p, val)) 
!= NULL) {


------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to