Changeset: e46fda98cfc4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e46fda98cfc4 Added Files: sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 Modified Files: clients/Tests/exports.stable.out sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out Branch: notepad Log Message:
Merge from default branch. diffs (124 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -2225,7 +2225,6 @@ void freeSymbolList(Symbol s); void freeVariable(MalBlkPtr mb, int varid); str fstrcmp0_impl(dbl *ret, str *string1, str *string2); str fstrcmp_impl(dbl *ret, str *string1, str *string2, dbl *minimum); -str function2str(MalBlkPtr mb); void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag); void garbageElement(Client cntxt, ValPtr v); str generatorRef; diff --git a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql --- a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql +++ b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql @@ -5,9 +5,9 @@ insert into htm values (120), (121), (12 insert into htm values (130), (131), (132), (133); -- select identical pairs -select * from htm a, htm b where [a.id] xmatch [b.id,0]; +select * from htm a, htm b where [a.id] xmatch [b.id,0] order by a.id, b.id; -- select pairs at distance one -select * from htm a, htm b where [a.id] xmatch [b.id,1]; +select * from htm a, htm b where [a.id] xmatch [b.id,1] order by a.id, b.id; drop table htm; diff --git a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out --- a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out +++ b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out @@ -62,18 +62,18 @@ Ready. % 3, 3 # length [ 100, 100 ] [ 100, 101 ] +[ 100, 102 ] +[ 100, 103 ] [ 101, 100 ] [ 101, 101 ] -[ 100, 102 ] -[ 100, 103 ] [ 101, 102 ] [ 101, 103 ] [ 102, 100 ] [ 102, 101 ] +[ 102, 102 ] +[ 102, 103 ] [ 103, 100 ] [ 103, 101 ] -[ 102, 102 ] -[ 102, 103 ] [ 103, 102 ] [ 103, 103 ] [ 110, 110 ] @@ -86,18 +86,18 @@ Ready. [ 113, 113 ] [ 120, 120 ] [ 120, 121 ] +[ 120, 122 ] +[ 120, 123 ] [ 121, 120 ] [ 121, 121 ] -[ 120, 122 ] -[ 120, 123 ] [ 121, 122 ] [ 121, 123 ] [ 122, 120 ] [ 122, 121 ] +[ 122, 122 ] +[ 122, 123 ] [ 123, 120 ] [ 123, 121 ] -[ 122, 122 ] -[ 122, 123 ] [ 123, 122 ] [ 123, 123 ] [ 130, 130 ] diff --git a/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 b/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 @@ -0,0 +1,44 @@ +stdout of test 'incorrect_result_type.Bug-3687` in directory 'sql/test/BugTracker-2015` itself: + + +# 15:10:52 > +# 15:10:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32751" "--set" "mapi_usock=/var/tmp/mtest-17407/.s.monetdb.32751" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 15:10:52 > + +# MonetDB 5 server v11.19.10 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.333 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32751/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-17407/.s.monetdb.32751 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 15:10:52 > +# 15:10:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17407" "--port=32751" +# 15:10:52 > + +#create table foo (a int); +#insert into foo values (1),(2),(3); +[ 3 ] +#select 100*v from (select sum(1) as v from foo group by a) as t; +% .L1 # table_name +% sql_mul_single_value # name +% hugeint # type +% 3 # length +[ 100 ] +[ 100 ] +[ 100 ] +#drop table foo; + +# 15:10:52 > +# 15:10:52 > "Done." +# 15:10:52 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
