Changeset: feab46331a00 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feab46331a00
Modified Files:
sql/backends/monet5/vaults/fits/fits.c
tools/merovingian/daemon/connections.c
Branch: default
Log Message:
Merge with Nov2019 branch.
diffs (36 lines):
diff --git a/sql/backends/monet5/vaults/fits/fits.c
b/sql/backends/monet5/vaults/fits/fits.c
--- a/sql/backends/monet5/vaults/fits/fits.c
+++ b/sql/backends/monet5/vaults/fits/fits.c
@@ -973,6 +973,10 @@ str FITSloadTable(Client cntxt, MalBlkPt
/* data load */
fits_get_num_rows(fptr, &rows, &status);
+ /* Nothing more to do */
+ if (rows == 0) {
+ goto bailout;
+ }
fprintf(stderr,"#Loading %ld rows in table %s\n", rows, tname);
for (j = 1; j <= cnum; j++) {
BAT *tmp = NULL;
diff --git a/tools/merovingian/daemon/connections.c
b/tools/merovingian/daemon/connections.c
--- a/tools/merovingian/daemon/connections.c
+++ b/tools/merovingian/daemon/connections.c
@@ -71,11 +71,17 @@ openConnectionTCP(int *ret, bool bind_ip
break; /* working */
}
if (rp == NULL) {
+ int e = errno;
if (result)
freeaddrinfo(result);
if (sock != -1)
closesocket(sock);
- return newErr("cannot bind to host %s", bindaddr);
+ if (result) { /* results found, tried socket,
setsockopt and bind calls */
+ errno = e;
+ return newErr("binding to stream socket port
%hu failed: %s", port, strerror(errno));
+ } else { /* no results found, could not translate
address */
+ return newErr("cannot translate host %s",
bindaddr);
+ }
}
server = rp->ai_addr;
length = rp->ai_addrlen;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
