Changeset: 44c6a6e487ec for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44c6a6e487ec Modified Files: sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err Branch: malerrors Log Message:
approve output diffs (35 lines): diff --git a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err --- a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err +++ b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err @@ -30,9 +30,6 @@ stderr of test 'merge_project.Bug-3955` # 14:00:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23806" "--port=36744" # 14:00:10 > -MAPI = (monetdb) /var/tmp/mtest-32041/.s.monetdb.36560 -QUERY = plan select * from r; -ERROR = !ParseException:SQLparser:SQLSTATE M0M27 !Semantic errors SyntaxException:RETURN missing # 14:00:10 > # 14:00:10 > "Done." diff --git a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err --- a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err +++ b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err @@ -31,13 +31,13 @@ stderr of test 'set-negative-querytimeou MAPI = (monetdb) /var/tmp/mtest-9911/.s.monetdb.38717 QUERY = CALL "sys"."settimeout"(-9); -ERROR = !Query time out should be > 0 -MAPI = (monetdb) /var/tmp/mtest-19764/.s.monetdb.39840 +ERROR = !MALException:timeout:Query time out should be > 0 +MAPI = (monetdb) /var/tmp/mtest-26073/.s.monetdb.33079 QUERY = CALL "sys"."settimeout"(7, -9); -ERROR = !Session time out should be > 0 -MAPI = (monetdb) /var/tmp/mtest-19764/.s.monetdb.39840 +ERROR = !MALException:timeout:Session time out should be > 0 +MAPI = (monetdb) /var/tmp/mtest-26073/.s.monetdb.33079 QUERY = CALL "sys"."setsession"(-8); -ERROR = !Query time out should be > 0 +ERROR = !MALException:timeout:Query time out should be > 0 # 17:30:21 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
