Changeset: 84e331264f97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84e331264f97
Modified Files:
        monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err
        monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out
Branch: default
Log Message:

kunion-and-nil.Bug-1667: backout changeset 48027:6b8b0867c049;
let' no approve output that's incomplete becasue an assertion was triggered


diffs (42 lines):

diff --git a/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err 
b/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err
--- a/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err
+++ b/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err
@@ -22,12 +22,9 @@ stderr of test 'kunion-and-nil.Bug-1667`
 # cmdline opt  mapi_port = 30334
 # cmdline opt  monet_prompt = 
 # cmdline opt  mal_listing = 2
-# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_tests_BugTracker
+# cmdline opt  gdk_dbname = mTests_tests_BugTracker
 
+# 16:48:27 >  
+# 16:48:27 >  "Done."
+# 16:48:27 >  
 
-
-
-# 19:30:56 >  
-# 19:30:56 >  "Done."
-# 19:30:56 >  
-
diff --git a/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out 
b/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out
--- a/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out
+++ b/monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out
@@ -28,6 +28,18 @@ function user.main():void;
     info := algebra.join(infoattrreverse,infoval);
     io.print(info);
 end main;
+#-----------------#
+# t    h         # name
+# oid  oid       # type
+#-----------------#
+[ 0@0,   nil     ]
+[ 1@0,   1@0     ]
+! [ 0@0,         nil     ] would be okay to appear here if the tkey value (see 
below) was 0
+#-----------------#
+# h    t         # name
+# str  str       # type
+#-----------------#
+[ "tkey", "0"    ]
 
 # 16:48:27 >  
 # 16:48:27 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to