Changeset: ac776abdf7d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac776abdf7d9
Modified Files:
common/stream/stream.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
merge
diffs (33 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4315,6 +4315,8 @@ bs2_read(stream *ss, void *buf, size_t e
ssize_t uncompressed_length = s->bufsiz;
size_t m = 0;
char *buf = s->buf;
+ snappy_status ret;
+
if (s->comp != COMPRESSION_NONE) {
buf = s->compbuf;
}
@@ -4392,6 +4394,8 @@ bs2_read(stream *ss, void *buf, size_t e
ssize_t uncompressed_length = s->bufsiz;
size_t m = 0;
char *buf = s->buf;
+ snappy_status ret;
+
if (s->comp != COMPRESSION_NONE) {
buf = s->compbuf;
}
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
@@ -1967,7 +1967,7 @@ static int mvc_export_resultset_prot10(r
switch(ATOMstorage(mtype)) {
case TYPE_str:
retval = 1;
- for(j = 0; j < nil_len; j++) {
+ for(j = 0; j < (size_t) nil_len; j++) {
retval = retval && mnstr_writeBte(s,
str_nil[j]);
}
break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
