Changeset: ccc29f07341c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccc29f07341c Added Files: sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 Modified Files: sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out Branch: Dec2016 Log Message:
Approve non-128bit int output. diffs (90 lines): diff --git a/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out b/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out --- a/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out +++ b/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out @@ -1,28 +1,28 @@ stdout of test 'inner_join_cross_join.Bug-6140` in directory 'sql/test/BugTracker-2016` itself: -# 18:15:02 > -# 18:15:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34376" "--set" "mapi_usock=/var/tmp/mtest-78057/.s.monetdb.34376" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/rkoopmanschap/projects/MonetDB-installation/var/MonetDB/mTests_sql_test_BugTracker-2016" -# 18:15:02 > +# 22:28:57 > +# 22:28:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38674" "--set" "mapi_usock=/var/tmp/mtest-22226/.s.monetdb.38674" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2016" +# 22:28:57 > -# MonetDB 5 server v11.26.0 +# MonetDB 5 server v11.25.4 (hg id: a2419f05a924+) # This is an unreleased version # Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads -# Compiled for x86_64-apple-darwin16.1.0/64bit with 128bit integers -# Found 16.000 GiB available main-memory. +# Compiled for x86_64-unknown-linux-gnu/64bit +# Found 15.523 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://dhcp-183.eduroam.cwi.nl:34376/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-78057/.s.monetdb.34376 +# Listening for connection requests on mapi:monetdb://meeuw.mullender.nl:38674/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-22226/.s.monetdb.38674 # MonetDB/GIS module loaded # MonetDB/SQL module loaded Ready. -# 18:15:02 > -# 18:15:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-78057" "--port=34376" -# 18:15:02 > +# 22:28:58 > +# 22:28:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-22226" "--port=38674" +# 22:28:58 > #create table "foo" #( @@ -35,13 +35,13 @@ Ready. #"value_var1" int #); #insert into "foo" values (1, 630); -[ 1 ] +[ 1 ] #insert into "foo" values (2, 420); -[ 1 ] +[ 1 ] #insert into "bar" values (1, 11); -[ 1 ] +[ 1 ] #insert into "bar" values (2, 27); -[ 1 ] +[ 1 ] #SELECT t1.key_var, t1.value_var2, t2.key_var, t2.value_var1 #FROM #( @@ -65,15 +65,16 @@ Ready. # GROUP BY t3."key_var" #) t1 #ON t2."key_var" = t1."key_var"; -% sys.t1, sys.t1, .t2, .t2 # table_name -% key_var, value_var2, key_var, value_var1 # name -% int, hugeint, int, hugeint # type -% 1, 3, 1, 2 # length -[ 1, 630, 1, 11 ] -[ 2, 420, 2, 27 ] +% sys.t1, sys.t1, .t2, .t2 # table_name +% key_var, value_var2, key_var, value_var1 # name +% int, bigint, int, bigint # type +% 1, 3, 1, 2 # length +[ 1, 630, 1, 11 ] +[ 2, 420, 2, 27 ] #DROP TABLE "foo"; #DROP TABLE "bar"; -# 18:15:02 > -# 18:15:02 > "Done." -# 18:15:02 > +# 22:28:58 > +# 22:28:58 > "Done." +# 22:28:58 > + diff --git a/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out b/sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 copy from sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out copy to sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list