Changeset: b208db26102d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b208db26102d
Modified Files:
gdk/gdk_storage.c
gdk/gdk_utils.c
Branch: default
Log Message:
merged with oct2020
diffs (33 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -62,7 +62,7 @@ GDKfilepath(int farmid, const char *dir,
assert(dir == NULL || *dir != DIR_SEP);
assert(farmid == NOFARM ||
(farmid >= 0 && farmid < MAXFARMS && BBPfarms[farmid].dirname));
- if (MT_path_absolute(name)) {
+ if (!GDKembedded() && MT_path_absolute(name)) {
GDKerror("name should not be absolute\n");
return NULL;
}
@@ -103,7 +103,7 @@ GDKcreatedir(const char *dir)
TRC_DEBUG(IO_, "GDKcreatedir(%s)\n", dir);
assert(!GDKinmemory(0));
- if (!MT_path_absolute(dir)) {
+ if (!GDKembedded() && !MT_path_absolute(dir)) {
GDKerror("directory '%s' is not absolute\n", dir);
return GDK_FAIL;
}
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -83,7 +83,7 @@ GDKenvironment(const char *dbpath)
TRC_CRITICAL(GDK, "Database name too long.\n");
return false;
}
- if (!MT_path_absolute(dbpath)) {
+ if (!GDKembedded() && !MT_path_absolute(dbpath)) {
TRC_CRITICAL(GDK, "Directory not an absolute path: %s.\n",
dbpath);
return false;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
