Changeset: d609f8c955af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d609f8c955af
Modified Files:
cmake/monetdb-custom-targets.cmake
tools/monetdbe/monetdbe.c
tools/monetdbe/monetdbe_mapi.c
Branch: default
Log Message:
merged
diffs (49 lines):
diff --git a/cmake/monetdb-custom-targets.cmake
b/cmake/monetdb-custom-targets.cmake
--- a/cmake/monetdb-custom-targets.cmake
+++ b/cmake/monetdb-custom-targets.cmake
@@ -7,13 +7,14 @@
#]]
if(WIN32)
- add_custom_target(mtest
- COMMAND
- ${CMAKE_INSTALL_FULL_BINDIR}/monetdb_mtest.bat
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set (MONETDB_MTEST_SCRIPT "monetdb_mtest.bat")
else()
+ set (MONETDB_MTEST_SCRIPT "monetdb_mtest.sh")
+endif()
+
+if (TESTING)
add_custom_target(mtest
- COMMAND
- ${CMAKE_INSTALL_FULL_BINDIR}/monetdb_mtest.sh
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ COMMAND
+ ${CMAKE_INSTALL_FULL_BINDIR}/${MONETDB_MTEST_SCRIPT}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endif()
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -462,7 +462,7 @@ monetdbe_startup(char* dbdir, monetdbe_o
GDKnr_threads = opts->nr_threads;
}
if (opts && opts->memorylimit) {
- GDK_vm_maxsize = opts->memorylimit;
+ GDK_vm_maxsize = (size_t) opts->memorylimit;
}
GDKtracer_set_adapter(mbedded); /* set the output of GDKtracer logs */
diff --git a/tools/monetdbe/monetdbe_mapi.c b/tools/monetdbe/monetdbe_mapi.c
--- a/tools/monetdbe/monetdbe_mapi.c
+++ b/tools/monetdbe/monetdbe_mapi.c
@@ -76,7 +76,7 @@ mapi_fetch_field(MapiHdl hdl, int fnr)
if (hdl && fnr < (int)hdl->result->ncols && hdl->current_row > 0 &&
hdl->current_row <= hdl->result->nrows) {
monetdbe_column *rcol = NULL;
if (monetdbe_result_fetch(hdl->result, &rcol, fnr) == NULL) {
- size_t r = hdl->current_row - 1;
+ size_t r = (size_t) hdl->current_row - 1;
if (rcol->type != monetdbe_str && !hdl->mapi_row[fnr]) {
hdl->mapi_row[fnr] =
MAPIalloc(SIMPLE_TYPE_SIZE);
if (!hdl->mapi_row[fnr]) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
