Changeset: 8b9909b19358 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b9909b19358 Modified Files: Branch: default Log Message:
Merge with Apr2011 branch. diffs (225 lines): diff --git a/sql/test/BugTracker-2011/Tests/All b/sql/test/BugTracker-2011/Tests/All --- a/sql/test/BugTracker-2011/Tests/All +++ b/sql/test/BugTracker-2011/Tests/All @@ -1,3 +1,5 @@ +copy-into-file-error.Bug-2722 +bulk_rotate_xor_hash-error.Bug-2734 aggregate-in-subquery.Bug-2739 correlated-update.Bug-2771 double_erange.Bug-2774 diff --git a/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.sql b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.sql @@ -0,0 +1,4 @@ +CREATE TABLE t_bug2734 (a INT); +INSERT INTO t_bug2734 VALUES (1); +SELECT * FROM (SELECT a, 1 AS n FROM t_bug2734 UNION SELECT a, 2 AS n FROM t_bug2734) AS abc INNER JOIN (SELECT a, 1 AS n FROM t_bug2734 UNION SELECT a, 2 AS n FROM t_bug2734) AS cba ON abc.a = cba.a AND abc.n = cba.n; +DROP TABLE t_bug2734; diff --git a/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.err b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.err @@ -0,0 +1,39 @@ +stderr of test 'bulk_rotate_xor_hash-error.Bug-2734` in directory 'test/BugTracker-2011` itself: + + +# 11:34:34 > +# 11:34:34 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" --set mapi_open=true --set mapi_port=38431 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 11:34:34 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 38431 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 11:34:34 > +# 11:34:34 > mclient -lsql -ftest -i -e --host=ottar --port=38431 +# 11:34:34 > + + +# 11:34:35 > +# 11:34:35 > Done. +# 11:34:35 > + diff --git a/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out @@ -0,0 +1,44 @@ +stdout of test 'bulk_rotate_xor_hash-error.Bug-2734` in directory 'test/BugTracker-2011` itself: + + +# 11:34:34 > +# 11:34:34 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" --set mapi_open=true --set mapi_port=38431 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 11:34:34 > + +# MonetDB 5 server v11.3.4 +# This is an unreleased version +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:38431/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 11:34:34 > +# 11:34:34 > mclient -lsql -ftest -i -e --host=ottar --port=38431 +# 11:34:34 > + +#CREATE TABLE t_bug2734 (a INT); +#INSERT INTO t_bug2734 VALUES (1); +[ 1 ] +#SELECT * FROM (SELECT a, 1 AS n FROM t_bug2734 UNION SELECT a, 2 AS n FROM t_bug2734) AS abc INNER JOIN (SELECT a, 1 AS n FROM t_bug2734 UNION SELECT a, 2 AS n FROM t_bug2734) AS cba ON abc.a = cba.a AND abc.n = cba.n; +% sys.abc, sys.abc, sys.cba, sys.cba # table_name +% a, n, a, n # name +% int, tinyint, int, tinyint # type +% 1, 1, 1, 1 # length +[ 1, 1, 1, 1 ] +[ 1, 2, 1, 2 ] +#DROP TABLE t_bug2734; + +# 11:34:35 > +# 11:34:35 > Done. +# 11:34:35 > + diff --git a/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.sql b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.sql @@ -0,0 +1,7 @@ +create table bug2722 (time timestamp, val int, fk int); +insert into bug2722 values (current_timestamp(), 1, 1); +insert into bug2722 values (current_timestamp(), 2, 2); +insert into bug2722 values (current_timestamp(), 3, 1); +insert into bug2722 values (current_timestamp(), 4, 2); +copy select val from bug2722 where fk=2 order by time into stdout using delimiters ' ' , '\n'; +drop table bug2722; diff --git a/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.err b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.err @@ -0,0 +1,40 @@ +stderr of test 'copy-into-file-error.Bug-2722` in directory 'test/BugTracker-2011` itself: + + +# 12:45:02 > +# 12:45:02 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" --set mapi_open=true --set mapi_port=33109 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 12:45:02 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 33109 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 12:50:26 > +# 12:50:26 > mclient -lsql -ftest -i -e --host=ottar --port=35703 +# 12:50:26 > + + + +# 12:50:26 > +# 12:50:26 > Done. +# 12:50:26 > + diff --git a/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.out b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.out @@ -0,0 +1,52 @@ +stdout of test 'copy-into-file-error.Bug-2722` in directory 'test/BugTracker-2011` itself: + + +# 12:45:02 > +# 12:45:02 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" --set mapi_open=true --set mapi_port=33109 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 12:45:02 > + +# MonetDB 5 server v11.3.4 +# This is an unreleased version +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:33109/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 12:45:02 > +# 12:45:02 > mclient -lsql -ftest -i -e --host=ottar --port=33109 +# 12:45:02 > + +#create table bug2722 (time timestamp, val int, fk int); +#insert into bug2722 values (current_timestamp(), 1, 1); +[ 1 ] +#insert into bug2722 values (current_timestamp(), 2, 2); +[ 1 ] +#insert into bug2722 values (current_timestamp(), 3, 1); +[ 1 ] +#insert into bug2722 values (current_timestamp(), 4, 2); +[ 1 ] +#copy select val from bug2722 where fk=2 order by time into stdout using delimiters ' ' , '\n'; +% sys.bug2722 # table_name +% val # name +% int # type +% 1 # length +2 +4 +#copy select val from bug2722 where fk=2 order by time into stdout using delimiters ' ' , '\n'; +[ 2 ] +#drop table bug2722; + +# 12:45:02 > +# 12:45:02 > Done. +# 12:45:02 > + _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
