Changeset: 2102a7a5082a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2102a7a5082a
Modified Files:
clients/mapilib/mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Fixes for windows.
diffs (33 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2869,7 +2869,7 @@ mapi_reconnect(Mapi mid)
if (prot_version == PROTOCOL_10) {
// if we are using protocol 10, we have to send
PROT10 to the server along with compression method
// so the server knows which protocol to use
- retval = snprintf(buf, BLOCK,
"%s:%s:%s:%s:%s:%s:%s%s:%zu:\n",
+ retval = snprintf(buf, BLOCK,
"%s:%s:%s:%s:%s:%s:%s%s:"LLFMT":\n",
#ifdef WORDS_BIGENDIAN
"BIG",
#else
@@ -2880,7 +2880,7 @@ mapi_reconnect(Mapi mid)
"PROT10",
comp == COMPRESSION_SNAPPY ?
"COMPRESSION_SNAPPY" : (comp == COMPRESSION_LZ4 ? "COMPRESSION_LZ4" :
"COMPRESSION_NONE"),
mid->compute_column_widths ?
"COMPUTECOLWIDTH" : "",
- mid->blocksize);
+ (lng) mid->blocksize);
} else {
retval = snprintf(buf, BLOCK,
"%s:%s:%s:%s:%s:\n",
#ifdef WORDS_BIGENDIAN
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
@@ -1982,7 +1982,7 @@ int mvc_export_resultset_prot10(mvc *m,
varsized++;
length_prefixed++;
}
- nil_len = strlen(str_nil) + 1;
+ nil_len = (int) strlen(str_nil) + 1;
} else {
fixed_lengths += typelen;
nil_len = typelen;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
