Changeset: 323202a035f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=323202a035f0
Modified Files:
ctest/tools/monetdbe/example2.c
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
merged
diffs (25 lines):
diff --git a/ctest/tools/monetdbe/example2.c b/ctest/tools/monetdbe/example2.c
--- a/ctest/tools/monetdbe/example2.c
+++ b/ctest/tools/monetdbe/example2.c
@@ -22,7 +22,7 @@ main(void)
#ifdef HAVE_HGE
monetdbe_options opts = { .have_hge = 1 };
#else
- monetdbe_options opts = { };
+ monetdbe_options opts = { 0 };
#endif
// second argument is a string for the db directory or NULL for
in-memory mode
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -499,7 +499,8 @@ monetdbe_startup(monetdbe_database_inter
goto cleanup;
}
// Memory limit is session specific
- memory = GDK_vm_maxsize = (size_t) opts->memorylimit;
+ memory = (size_t) opts->memorylimit;
+ GDK_vm_maxsize = (size_t) memory << 20; /* convert from MiB to
bytes */
}
if (opts && opts->querytimeout) {
if( opts->querytimeout < 0){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
