Changeset: d2d4def63589 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2d4def63589
Modified Files:
monetdb5/optimizer/opt_mergetable.c
tools/merovingian/ChangeLog.Feb2013
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
merged with Feb2013
diffs (39 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -259,7 +259,7 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat
{
int tpe, k, is_select = isSubSelect(p), is_mirror = (getFunctionId(p)
== mirrorRef);
int is_identity = (getFunctionId(p) == identityRef && getModuleId(p) ==
batcalcRef);
- int ident_var = 0, is_assign = (getFunctionId(p) == NULL), n;
+ int ident_var = 0, is_assign = (getFunctionId(p) == NULL), n = 0;
InstrPtr r = NULL, q;
/* Find the mat we overwrite */
diff --git a/tools/merovingian/ChangeLog.Feb2013
b/tools/merovingian/ChangeLog.Feb2013
--- a/tools/merovingian/ChangeLog.Feb2013
+++ b/tools/merovingian/ChangeLog.Feb2013
@@ -1,3 +1,7 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Fri Nov 15 2013 Fabian Groffen <[email protected]>
+- monetdbd(1) now refuses to startup if it cannot read the properties
+ from the dbfarm, bug #3398
+
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
@@ -660,7 +660,11 @@ main(int argc, char *argv[])
}
/* read the merovingian properties from the dbfarm */
- readProps(ckv, ".");
+ if (readProps(ckv, ".") != 0) {
+ Mfprintf(stderr, "cannot find or read properties file, was "
+ "this dbfarm created by `monetdbd create`?\n");
+ MERO_EXIT_CLEAN(1);
+ }
_mero_props = ckv;
pidfilename = getConfVal(_mero_props, "pidfile");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
