Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15456
Modified Files:
merovingian_controlrunner.c monetdb.c
Log Message:
status is also a multiline response (OK + data) so make sure we wait for the
entire message
U merovingian_controlrunner.c
Index: merovingian_controlrunner.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_controlrunner.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- merovingian_controlrunner.c 25 Sep 2009 13:55:39 -0000 1.25
+++ merovingian_controlrunner.c 25 Sep 2009 14:06:50 -0000 1.26
@@ -589,16 +589,16 @@
if (q == NULL) {
Mfprintf(_mero_ctlout, "%s:
served status list\n",
origin);
-
- /* because this command is
multi line, you can't
- * combine it, disconnect the
client */
- break;
} else {
Mfprintf(_mero_ctlout, "%s:
returned status for "
"'%s'\n",
origin, q);
}
SABAOTHfreeStatus(&topdb);
+
+ /* because this command is multi line,
you can't
+ * combine it, disconnect the client */
+ break;
} else if (strcmp(q, "anelosimus") == 0 &&
strcmp(p, "eximius") == 0)
{
U monetdb.c
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- monetdb.c 25 Sep 2009 09:34:14 -0000 1.64
+++ monetdb.c 25 Sep 2009 14:06:50 -0000 1.65
@@ -306,7 +306,7 @@
"flyghende", "hollander", 1, mero_pass);
} else {
e = control_send(&buf, mero_host, mero_port,
- database, "status", 0, mero_pass);
+ 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
