Changeset: 0f52db3d0ee0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f52db3d0ee0
Modified Files:
        
sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err
        
sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out
Branch: Jul2017
Log Message:

approved output (we don't support deletes on merge tables)


diffs (35 lines):

diff --git 
a/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err 
b/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err
--- a/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err
+++ b/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err
@@ -29,6 +29,15 @@ stderr of test 'delete_from_merge_table.
 # 17:32:34 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-19147" "--port=31497"
 # 17:32:34 >  
 
+MAPI  = (monetdb) /var/tmp/mtest-8392/.s.monetdb.34552
+QUERY = delete from tt where t = 1;
+ERROR = !DELETE FROM: cannot delete from merge table 'tt'
+MAPI  = (monetdb) /var/tmp/mtest-8392/.s.monetdb.34552
+QUERY = delete from tt where t = 2;
+ERROR = !DELETE FROM: cannot delete from merge table 'tt'
+MAPI  = (monetdb) /var/tmp/mtest-8392/.s.monetdb.34552
+QUERY = delete from tt;
+ERROR = !DELETE FROM: cannot delete from merge table 'tt'
 
 # 17:32:35 >  
 # 17:32:35 >  "Done."
diff --git 
a/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out 
b/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out
--- a/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out
+++ b/sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out
@@ -81,12 +81,6 @@ Ready.
 % 1 # length
 [ 1    ]
 [ 2    ]
-#delete from tt where t = 1;
-[ 1    ]
-#delete from tt where t = 2;
-[ 1    ]
-#delete from tt;
-[ 0    ]
 #drop table tt cascade;
 #drop table t1 cascade;
 #drop table t2 cascade;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to