Changeset: ef4be661be5b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef4be661be5b Modified Files: sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/copy/Tests/key_copy.stable.err Branch: default Log Message:
Approvals. diffs (47 lines): diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out @@ -48,7 +48,7 @@ Operation successful +--------------------------------------------------------------------------------------------------+ | mal | +==================================================================================================+ -| function user.s3_1{autoCommit=true}():void; | +| function user.s4_1{autoCommit=true}():void; | | X_41:void := querylog.define("explain select count(*) from tables\n;","sequential_pipe",27); | | X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); | | X_2 := sql.mvc(); | @@ -74,7 +74,7 @@ Operation successful | X_33 := bat.append(X_27,X_32,true); | | X_34:wrd := aggr.sum(X_33); | | sql.resultSet(".L3","L3","wrd",64,0,7,X_34); | -| end user.s3_1; | +| end user.s4_1; | +--------------------------------------------------------------------------------------------------+ 27 rows diff --git a/sql/test/copy/Tests/key_copy.stable.err b/sql/test/copy/Tests/key_copy.stable.err --- a/sql/test/copy/Tests/key_copy.stable.err +++ b/sql/test/copy/Tests/key_copy.stable.err @@ -30,19 +30,20 @@ stderr of test 'key_copy` in directory ' # 18:36:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6766" "--port=32293" # 18:36:17 > -MAPI = (monetdb) /var/tmp/mtest-12742/.s.monetdb.32855 +MAPI = (monetdb) /var/tmp/mtest-27471/.s.monetdb.33963 QUERY = copy 4 records into cik1 from stdin USING DELIMITERS ',','\n','\"' NULL AS ''; 0 5 5 9 ERROR = !INSERT INTO: PRIMARY KEY constraint 'cik1.cik1_i_pkey' violated -MAPI = (monetdb) /var/tmp/mtest-12742/.s.monetdb.32855 +MAPI = (monetdb) /var/tmp/mtest-27471/.s.monetdb.33963 QUERY = copy 4 records into cik2 from stdin USING DELIMITERS ',','\n','\"' NULL AS ''; 0,1 5,1 5,1 9,1 +ERROR = !INSERT INTO: PRIMARY KEY constraint 'cik2.cik2_i_j_pkey' violated # 18:36:17 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list