Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5202

Modified Files:
        monetdb_merocom.c 
Log Message:
fix start, kill and stop

U monetdb_merocom.c
Index: monetdb_merocom.c
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb_merocom.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- monetdb_merocom.c   9 Sep 2009 12:11:41 -0000       1.7
+++ monetdb_merocom.c   9 Sep 2009 20:21:05 -0000       1.8
@@ -133,11 +133,11 @@
                                printf("%s%sing database '%s'... ", type, mode 
== STOP ? "p" : "", stats->dbname);
                                fflush(stdout);
                                out = control_send(&res, mero_control, 0, 
stats->dbname, type);
-                               if (out == NULL && strcmp(res, "OK\n") == 0) {
+                               if (out == NULL && strcmp(res, "OK") == 0) {
                                        printf("done\n");
                                } else {
                                        res = out == NULL ? res : out;
-                                       printf("FAILED:\n%s", res);
+                                       printf("FAILED:\n%s\n", res);
                                        ret = 1;
                                }
                                free(res);
@@ -149,11 +149,11 @@
                                printf("starting database '%s'... ", 
stats->dbname);
                                fflush(stdout);
                                out = control_send(&res, mero_control, 0, 
stats->dbname, type);
-                               if (out == NULL && strcmp(res, "OK\n") == 0) {
+                               if (out == NULL && strcmp(res, "OK") == 0) {
                                        printf("done\n");
                                } else {
                                        res = out == NULL ? res : out;
-                                       printf("FAILED:\n%s", res);
+                                       printf("FAILED:\n%s\n", res);
                                        ret = 1;
                                }
                                free(res);


------------------------------------------------------------------------------
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

Reply via email to