MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: cd555395f59c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd555395f59c
Modified Files:
        tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (12 lines):

diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -645,7 +645,7 @@ main(int argc, char *argv[])
                                Mfprintf(stderr, "could not get dbfarm working 
directory: %s\n",
                                                strerror(errno));
                        }
-                       MERO_EXIT(1);
+                       MERO_EXIT_CLEAN(1);
                }
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list