Changeset: 12897126f239 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12897126f239
Modified Files:
tools/merovingian/ChangeLog.Dec2011
tools/merovingian/daemon/controlrunner.c
Branch: Dec2011
Log Message:
ctl_handle_client: don't send double trailing newlines
Fix for bug #2984. Due to sending too many newlines, the client code
interpreted the answer from the server as not being the exact string
"OK\n". (Correct, there was another '\n').
diffs (23 lines):
diff --git a/tools/merovingian/ChangeLog.Dec2011
b/tools/merovingian/ChangeLog.Dec2011
--- a/tools/merovingian/ChangeLog.Dec2011
+++ b/tools/merovingian/ChangeLog.Dec2011
@@ -1,3 +1,7 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Mon Jan 30 2012 Fabian Groffen <fab...@cwi.nl>
+- Resolved problem where remote start/stop/etc. commands with monetdb
+ would report error 'OK'.
+
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -228,7 +228,7 @@ static void ctl_handle_client(
if (strcmp(p, "ping") == 0) {
#define send_client(P) \
if (fout != NULL) { \
- mnstr_printf(fout, P "%s\n", buf2); \
+ mnstr_printf(fout, P "%s", buf2); \
mnstr_flush(fout); \
} else { \
send(msgsock, buf2, len, 0); \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
