Changeset: 0abdc0eae432 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0abdc0eae432
Modified Files:
clients/mapilib/mapi.c
monetdb5/modules/atoms/Makefile.ag
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
More compilation fixes.
diffs (37 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -5595,7 +5595,7 @@ mapi_fetch_row(MapiHdl hdl)
if (!mnstr_readLng(hdl->mid->from,
&new_size)) {
return hdl->mid->error;
}
- if (new_size < hdl->mid->blocksize) {
+ if ((size_t) new_size <
hdl->mid->blocksize) {
return mapi_setError(hdl->mid,
"Request for buffer resize, but new size smaller than old size.",
"mapi_fetch_row", MERROR);
}
// consume flush
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -28,6 +28,7 @@ lib_atoms = {
url.c url.h \
uuid.c \
xml.c xml.h
+ LIBS = ../../../common/utils/libconversion
}
headers_mal = {
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1911,8 +1911,9 @@ static int mvc_export_resultset_prot10(m
int nil_len = -1;
int retval = -1;
int convert_to_string =
!type_supports_binary_transfer(c->type.type);
+ sql_type *type = c->type.type;
+
iterators[i] = bat_iterator(b);
- sql_type *type = c->type.type;
if (type->eclass == EC_TIMESTAMP) {
// timestamps are converted to Unix Timestamps
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
