Changeset: c48d67371f75 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c48d67371f75
Modified Files:
geom/sql/Tests/relation.stable.err
monetdb5/mal/mal_interpreter.c
sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
Branch: Oct2014
Log Message:
Don't add an extra newline to errors from GDK.
diffs (103 lines):
diff --git a/geom/sql/Tests/relation.stable.err
b/geom/sql/Tests/relation.stable.err
--- a/geom/sql/Tests/relation.stable.err
+++ b/geom/sql/Tests/relation.stable.err
@@ -10,37 +10,36 @@ stderr of test 'relation` in directory '
# 22:42:46 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=koala --port=32262
# 22:42:46 >
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('LINESTRING(10 10)');
ERROR = !IllegalArgumentException: point array must contain 0 or >1 elements
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('LINESTRING(10)');
ERROR = !ParseException: Expected number but encountered ')'
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('LINESTRING()');
ERROR = !ParseException: Expected number but encountered ')'
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('LINESTRING');
ERROR = !ParseException: Expected word but encountered end of stream
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('');
ERROR = !ParseException: Expected word but encountered end of stream
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('POINT(10)');
ERROR = !ParseException: Expected number but encountered ')'
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('POINT()');
ERROR = !ParseException: Expected number but encountered ')'
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('POINT');
ERROR = !ParseException: Expected word but encountered end of stream
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO geoms values ('');
ERROR = !ParseException: Expected word but encountered end of stream
-MAPI = monetdb@madrid:30163
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where
a.g is not NULL and b.g is not NULL order by a.g, b.g;
ERROR = !GDKerror:!ERROR: IllegalArgumentException: IllegalArgumentException:
Should be length 9, is [Touches] instead
- !
# 14:48:45 >
# 14:48:45 > Done.
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -1330,7 +1330,7 @@ str catchKernelException(Client cntxt, s
/* trap hidden (GDK) exception */
z = (char*)GDKmalloc(strlen("GDKerror:") +
strlen(errbuf) + 2);
if (z)
- sprintf(z, "GDKerror:%s\n", errbuf);
+ sprintf(z, "GDKerror:%s", errbuf);
}
/* did we eat the error away of not */
if (z)
diff --git
a/sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
b/sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
--- a/sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
+++ b/sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
@@ -30,30 +30,24 @@ stderr of test 'inet_error_handling.Bug-
# 10:46:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29407" "--port=30088"
# 10:46:21 >
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('192.168.1');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
- !
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('192.168.2.');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
- !
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('193');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
- !
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('193.169');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
- !
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('193.169.13');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
- !
-MAPI = (monetdb) /var/tmp/mtest-29407/.s.monetdb.30088
+MAPI = (monetdb) /var/tmp/mtest-14314/.s.monetdb.37270
QUERY = INSERT INTO INET_TBL VALUES ('193.169.13.4/80');
ERROR = !GDKerror:!ERROR: Illegal mask value: 80
- !
# 10:46:21 >
# 10:46:21 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
