Changeset: e29ea91e5248 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e29ea91e5248
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (26 lines):
diff --git a/sql/test/UserDump/Tests/dump_with_test.reqtests
b/sql/test/UserDump/Tests/dump_with_test.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_test.reqtests
@@ -0,0 +1,1 @@
+create4
diff --git a/sql/test/UserDump/Tests/dump_with_voc.reqtests
b/sql/test/UserDump/Tests/dump_with_voc.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_voc.reqtests
@@ -0,0 +1,1 @@
+create4
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -146,8 +146,9 @@ logFD(dpair dp, int fd, const char *type
assert(fd == 0 || fd == 1);
do {
do {
+ ssize_t n;
repeat:
- ssize_t n = read(dp->input[fd].fd, buf + len,
sizeof(buf) - len - 1);
+ n = read(dp->input[fd].fd, buf + len, sizeof(buf) - len
- 1);
if (n <= 0)
break;
len += n;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
