Changeset: fff16ed8296a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fff16ed8296a
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: Apr2019
Log Message:
Partially undo changeset 8c81c7bcca61.
The "fix" wasn't.
diffs (26 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -402,14 +402,16 @@ tablet_read_more(bstream *in, stream *ou
do {
/* query is not finished ask for more */
/* we need more query text */
- if (in->eof) {
- if (mnstr_write(out, PROMPT2, sizeof(PROMPT2) -
1, 1) < 0 ||
- mnstr_flush(out) < 0)
- return false;
- in->eof = false;
- }
if (bstream_next(in) < 0)
return false;
+ if (in->eof) {
+ if (mnstr_write(out, PROMPT2, sizeof(PROMPT2) -
1, 1) == 1)
+ mnstr_flush(out);
+ in->eof = false;
+ /* we need more query text */
+ if (bstream_next(in) <= 0)
+ return false;
+ }
} while (in->len <= in->pos);
} else if (bstream_read(in, n) <= 0) {
return false;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
