Changeset: 8f3b52cdbd8b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f3b52cdbd8b
Modified Files:
gdk/gdk_imprints.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
Branch: Oct2014
Log Message:
merge
Unterschiede (58 Zeilen):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -875,14 +875,15 @@ IMPSremove(BAT *b)
assert(!VIEWtparent(b));
MT_lock_set(&GDKimprintsLock(abs(b->batCacheid)), "BATimprints");
- imprints = b->T->imprints;
- b->T->imprints = NULL;
+ if ((imprints = b->T->imprints) != NULL) {
+ b->T->imprints = NULL;
- HEAPdelete(imprints->imprints, BBP_physical(b->batCacheid),
- b->batCacheid > 0 ? "timprints" : "himprints");
+ HEAPdelete(imprints->imprints, BBP_physical(b->batCacheid),
+ b->batCacheid > 0 ? "timprints" : "himprints");
- GDKfree(imprints->imprints);
- GDKfree(imprints);
+ GDKfree(imprints->imprints);
+ GDKfree(imprints);
+ }
MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), "BATimprints");
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -325,7 +325,7 @@ forkMserver(char *database, sabdb** stat
readonly = "--readonly";
kv = findConfKey(ckv, "embedr");
- if (kv->val != NULL && strcmp(kv->val, "false") != 0)
+ if (kv->val != NULL && strcmp(kv->val, "no") != 0)
embeddedr = "embedded_r=true";
freeConfFile(ckv);
@@ -392,7 +392,7 @@ forkMserver(char *database, sabdb** stat
if (pipeline[0] != '\0') {
argv[c++] = "--set"; argv[c++] = pipeline;
}
- if (embeddedr[0] != '\0') {
+ if (embeddedr != NULL) {
argv[c++] = "--set"; argv[c++] = embeddedr;
}
if (readonly != NULL) {
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
@@ -466,6 +466,8 @@ main(int argc, char *argv[])
kv->val = strdup("yes");
kv = findConfKey(_mero_db_props, "readonly");
kv->val = strdup("no");
+ kv = findConfKey(_mero_db_props, "embedr");
+ kv->val = strdup("no");
kv = findConfKey(_mero_db_props, "nclients");
kv->val = strdup("64");
kv = findConfKey(_mero_db_props, "type");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
