Changeset: 921c0a86b6f1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/921c0a86b6f1
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (20 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -598,7 +598,7 @@ MCreadClient(Client c)
in->pos++;
if (in->pos >= in->len || in->mode) {
- ssize_t rd, sum = 0;
+ ssize_t rd;
if (in->eof || !isa_block_stream(c->fdout)) {
if (!isa_block_stream(c->fdout) && c->promptlength > 0)
@@ -607,7 +607,6 @@ MCreadClient(Client c)
in->eof = false;
}
while ((rd = bstream_next(in)) > 0 && !in->eof) {
- sum += rd;
if (!in->mode) /* read one line at a time in line mode
*/
break;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list