Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27599
Modified Files:
monetdb.c monetdb_merocom.c
Log Message:
control_send no longer returns the trailing newline
U monetdb.c
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- monetdb.c 9 Sep 2009 09:50:41 -0000 1.39
+++ monetdb.c 9 Sep 2009 11:47:37 -0000 1.40
@@ -224,7 +224,7 @@
} else {
char *out;
ret = control_send(&out, mero_control, -1, argv[i],
"create");
- if (ret == NULL && strcmp(out, "OK\n") != 0)
+ if (ret == NULL && strcmp(out, "OK") != 0)
ret = out;
}
@@ -310,7 +310,7 @@
} else {
char *out;
ret = control_send(&out, mero_control, -1, argv[i],
"destroy");
- if (ret == NULL && strcmp(out, "OK\n") != 0)
+ if (ret == NULL && strcmp(out, "OK") != 0)
ret = out;
}
U monetdb_merocom.c
Index: monetdb_merocom.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb_merocom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- monetdb_merocom.c 9 Sep 2009 09:52:11 -0000 1.5
+++ monetdb_merocom.c 9 Sep 2009 11:47:37 -0000 1.6
@@ -173,7 +173,7 @@
snprintf(share, sizeof(share), "share=%s", value);
out = control_send(&res, mero_control, 0,
stats->dbname, share);
- if (out != NULL || strcmp(res, "OK\n") != 0) {
+ if (out != NULL || strcmp(res, "OK") != 0) {
res = out == NULL ? res : out;
printf("FAILED:\n%s", res);
ret = 1;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
