Changeset: 9aa93ad17a06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aa93ad17a06
Modified Files:
common/utils/msabaoth.c
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr35.py
Branch: default
Log Message:
Merge with linear-hashing branch.
diffs (12 lines):
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -640,7 +640,7 @@ msab_getSingleStatus(const char *pathbuf
}
(void)fclose(f);
}
- } else if ((snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname,
".gdk_lock") > 0) & /* no typo */
+ } else if (snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname,
".gdk_lock"),
((fd = MT_lockf(buf, F_TEST)) == -2)) {
/* Locking failed; this can be because the lockfile couldn't
* be created. Probably there is no Mserver running for
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
