Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24417
Modified Files:
Tag: Nov2009
merovingian_controlrunner.c monetdb.c
Log Message:
say bye to vanderdecken, he's a bit misplaced here, use the far more
descriptive #all here
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.1
retrieving revision 1.26.2.2
diff -u -d -r1.26.2.1 -r1.26.2.2
--- merovingian_controlrunner.c 29 Sep 2009 07:57:09 -0000 1.26.2.1
+++ merovingian_controlrunner.c 29 Sep 2009 08:35:03 -0000 1.26.2.2
@@ -571,14 +571,15 @@
Mfprintf(_mero_ctlout, "%s: served
property list for "
"database '%s'\n",
origin, q);
break;
- } else if (strcmp(p, "status") == 0 || (
- strcmp(q, "flyghende")
== 0 &&
- strcmp(p, "hollander")
== 0 && (q = NULL) == NULL))
- {
+ } else if (strcmp(p, "status") == 0) {
sabdb *stats;
sabdb *topdb;
char *sdb;
+ if (strcmp(q, "#all") == 0)
+ /* list all */
+ q = NULL;
+
/* return a list of sabdb structs for
our local
* databases */
if ((e = SABAOTHgetStatus(&stats, q))
!= MAL_SUCCEED) {
U monetdb.c
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.65.2.1
retrieving revision 1.65.2.2
diff -u -d -r1.65.2.1 -r1.65.2.2
--- monetdb.c 29 Sep 2009 07:59:57 -0000 1.65.2.1
+++ monetdb.c 29 Sep 2009 08:35:03 -0000 1.65.2.2
@@ -299,15 +299,11 @@
char *buf;
char *e;
- if (database == NULL) {
- /* I ran out of creative ideas on this one, so I just injected
- * the last(?) sight we might see from van der Decken */
- e = control_send(&buf, mero_host, mero_port,
- "flyghende", "hollander", 1, mero_pass);
- } else {
- e = control_send(&buf, mero_host, mero_port,
- database, "status", 1, mero_pass);
- }
+ if (database == NULL)
+ database = "#all";
+
+ e = control_send(&buf, mero_host, mero_port,
+ database, "status", 1, mero_pass);
if (e != NULL)
return(e);
------------------------------------------------------------------------------
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
