Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23405/src/backends/monet5/merovingian
Modified Files:
merovingian_controlrunner.c
Log Message:
propagated changes of Friday Oct 09 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/09 - mr-meltdown:
src/backends/monet5/merovingian/merovingian_controlrunner.c,1.26.2.5
properly return a database not found error when one requests the status of a
specific database that does not exist, instead of returning an empty list
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: merovingian_controlrunner.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_controlrunner.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- merovingian_controlrunner.c 2 Oct 2009 07:31:03 -0000 1.29
+++ merovingian_controlrunner.c 9 Oct 2009 08:57:03 -0000 1.30
@@ -632,6 +632,17 @@
freeErr(e);
break;
}
+
+ if (stats == NULL && q != NULL) {
+ Mfprintf(_mero_ctlerr, "%s:
received status signal for "
+ "unknown
database: %s\n", origin, q);
+ len = snprintf(buf2,
sizeof(buf2),
+ "unknown
database: %s\n", q);
+ len = snprintf(buf2,
sizeof(buf2), "no such database '%s'\n", q);
+ send(msgsock, buf2, len, 0);
+ break;
+ }
+
len = snprintf(buf2, sizeof(buf2),
"OK\n");
send(msgsock, buf2, len, 0);
------------------------------------------------------------------------------
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
