Changeset: bcc00efe3ca1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcc00efe3ca1
Branch: Oct2020
Log Message:
merged
diffs (47 lines):
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -670,26 +670,26 @@ IOimport(void *ret, bat *bid, str *fnme)
BBPunfix(b->batCacheid);
fclose(fp);
GDKfree(buf);
- throw(MAL, "io.import", OPERATION_FAILED " fileno()");
+ throw(MAL, "io.import", OPERATION_FAILED ": fileno()");
}
if (fstat(fn, &st) != 0) {
BBPunfix(b->batCacheid);
fclose(fp);
GDKfree(buf);
- throw(MAL, "io.imports", OPERATION_FAILED "fstat()");
+ throw(MAL, "io.imports", OPERATION_FAILED ": fstat()");
}
(void) fclose(fp);
if (st.st_size <= 0) {
BBPunfix(b->batCacheid);
GDKfree(buf);
- throw(MAL, "io.imports", OPERATION_FAILED "Empty file");
+ throw(MAL, "io.imports", OPERATION_FAILED ": empty
file");
}
#if SIZEOF_SIZE_T == SIZEOF_INT
- if (st.st_size > (off_t) ~ (size_t) 0) {
+ if (st.st_size > 0x7FFFFFFF) {
BBPunfix(b->batCacheid);
GDKfree(buf);
- throw(MAL, "io.imports", OPERATION_FAILED "File too
large");
+ throw(MAL, "io.imports", OPERATION_FAILED ": file too
large");
}
#endif
base = cur = (char *) GDKmmap(*fnme, MMAP_SEQUENTIAL, (size_t)
st.st_size);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3059,7 +3059,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
else:
s = '%-*s ' % (length, TST)
STDOUT.write('%s%s' % (prompt(), s))
- if isatty:
+ if isatty and TIMEOUT > 0:
s = '(<=%d,%d,%d)' % (TIMEOUT, CTIMEOUT, STIMEOUT)
STDOUT.write(s + '\b' * len(s))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
