Changeset: acd9a2161890 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acd9a2161890
Modified Files:
        
sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err
        
sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
Branch: Jul2015
Log Message:

approved output


diffs (25 lines):

diff --git 
a/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err
 
b/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err
--- 
a/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err
+++ 
b/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err
@@ -30,6 +30,9 @@ stderr of test 'insert_into_merge_table_
 # 16:55:06 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-1086" "--port=39600"
 # 16:55:06 >  
 
+MAPI  = (monetdb) /var/tmp/mtest-5390/.s.monetdb.38366
+QUERY = insert into m values (1);
+ERROR = !INSERT INTO: cannot insert into merge table 'm'
 
 # 16:55:06 >  
 # 16:55:06 >  "Done."
diff --git 
a/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
 
b/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
--- 
a/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
+++ 
b/sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
@@ -59,8 +59,6 @@ Ready.
 #create merge table m (i int);
 #alter table m add table t1;
 #alter table m add table t2;
-#insert into m values (1);
-[ "error message expected here" ]
 #drop table m;
 #drop table t2;
 #drop table t1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to