Changeset: 68c113f145ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68c113f145ec
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (40 lines):
diff -r 6f1fa0dcd36a -r 68c113f145ec clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c Fri Oct 15 11:35:33 2010 +0200
+++ b/clients/src/mapiclient/mclient.c Mon Oct 18 10:45:37 2010 +0200
@@ -2727,14 +2727,18 @@
if (optind < argc) {
/* execute from file(s) */
while (optind < argc) {
- if (echoquery) {
+ if (echoquery &&
+ stat(argv[optind], &statb) == 0 &&
+ S_ISREG(statb.st_mode) &&
+ statb.st_size < 1024*1024) {
/* a bit of a hack: process file
line-by-line if using -e (--echo)
- so that the queries that are echoed
- have something to do with the
- output that follows (otherwise we
- just echo the start of the file for
- each query) */
+ and the input file isn't "too
+ large" so that the queries that are
+ echoed have something to do with
+ the output that follows (otherwise
+ we just echo the start of the file
+ for each query) */
FILE *fp;
if ((fp = fopen(argv[optind], "r")) == NULL) {
fprintf(stderr, "%s: cannot open\n",
argv[optind]);
diff -r 6f1fa0dcd36a -r 68c113f145ec testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Fri Oct 15 11:35:33 2010 +0200
+++ b/testing/src/Mtest.py.in Mon Oct 18 10:45:37 2010 +0200
@@ -2564,7 +2564,7 @@
segfaulted = False
# Try to detect segfaults and the like
- TO = re.compile("(^|[\t ])(Memory [Ff]ault|Segmentation [Ff]ault|Bus
[Ee]rror|Abort(|ed)|Assertion failed:|!FATAL: BATSIGabort:|ERROR = !Connection
terminated)([ \t]|$)", re.MULTILINE)
+ TO = re.compile("(^|[\t ])(Memory [Ff]ault|Segmentation [Ff]ault|Bus
[Ee]rror|Abort(|ed)|Assertion failed:|!FATAL: BATSIGabort:)([ \t]|$)",
re.MULTILINE)
# FIXME: this begs for a much nicer solution (100% copy of below)
if os.path.isfile(TestErrFile):
for l in open(TestErrFile):
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
