Changeset: 7fa5ee71ec80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fa5ee71ec80
Modified Files:
clients/mapilib/mapi.c
gdk/gdk_join.c
Branch: transaction-replication
Log Message:
Merge with default branch
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
@@ -2551,7 +2551,7 @@ mapi_start_talking(Mapi mid)
/* consume server challenge */
len = mnstr_read_block(mid->from, buf, 1, BLOCK);
- check_stream(mid, mid->from, "Connection terminated",
"mapi_start_talking", (mid->blk.eos = 1, mid->error));
+ check_stream(mid, mid->from, "Connection terminated while starting",
"mapi_start_talking", (mid->blk.eos = 1, mid->error));
assert(len < BLOCK);
@@ -3441,7 +3441,7 @@ read_line(Mapi mid)
if (mid->trace == MAPI_TRACE)
printf("fetch next block: start at:%d\n", mid->blk.end);
len = mnstr_read(mid->from, mid->blk.buf + mid->blk.end, 1,
BLOCK);
- check_stream(mid, mid->from, "Connection terminated",
"read_line", (mid->blk.eos = 1, (char *) 0));
+ check_stream(mid, mid->from, "Connection terminated during read
line", "read_line", (mid->blk.eos = 1, (char *) 0));
if (mid->tracelog) {
mapi_log_header(mid, "R");
mnstr_write(mid->tracelog, mid->blk.buf + mid->blk.end,
1, len);
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1518,7 +1518,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
}
if (lcand &&
nl > 1 &&
- lcand[-1] != lcand[-1 - nl] + nl) {
+ lcand[-1] != lcand[-1 - (ssize_t) nl] + nl) {
/* not all values in the range are
* candidates */
lskipped = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
