Changeset: b13fbf2bf993 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b13fbf2bf993 Modified Files: MonetDB.spec Branch: default Log Message:
Merge with Apr2011 branch. diffs (165 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -588,7 +588,7 @@ * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - gdk: Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ monetdb (11.3.1-20110414) unstable; urgency=low * gdk: Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. -- Sjoerd Mullender <[email protected]> Thu, 14 Apr 2011 10:11:07 +0200 diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -3,7 +3,7 @@ * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. * Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 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 @@ -6,3 +6,4 @@ crash_in_modulo_rand.Bug-2766 nested_select.Bug-2801 ambigous_idx_name.Bug-2800 +crash_on_alias.Bug-2798 diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql @@ -0,0 +1,14 @@ +-- can't drop table after crash +START TRANSACTION; + +CREATE TABLE dbg (a INT, b INT); +INSERT INTO dbg (a,b) VALUES (10,10); + +-- no alias around the SUM(b), works +SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d; + +-- alias e, crashes :/ +SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP +BY d; + +ROLLBACK; diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err @@ -0,0 +1,39 @@ +stderr of test 'crash_on_alias.Bug-2798` in directory 'test/BugTracker-2011` itself: + + +# 14:09:56 > +# 14:09:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm" --set mapi_open=true --set mapi_port=31436 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:09:56 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/monetdb/Apr2011/program-x86_64/var/lib/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 = /net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31436 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 14:09:56 > +# 14:09:56 > mclient -lsql -ftest -i -e --host=volund --port=31436 +# 14:09:56 > + + +# 14:09:56 > +# 14:09:56 > Done. +# 14:09:56 > + diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out @@ -0,0 +1,53 @@ +stdout of test 'crash_on_alias.Bug-2798` in directory 'test/BugTracker-2011` itself: + + +# 14:09:56 > +# 14:09:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm" --set mapi_open=true --set mapi_port=31436 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:09:56 > + +# MonetDB 5 server v11.3.1 "Apr2011-f9a21e4aaff7" +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-pc-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://volund.ins.cwi.nl:31436/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +could not find (null).e +dbg.d +dbg.L10 +L12.L12 +dbg.d + +Over.. + +# 14:09:56 > +# 14:09:56 > mclient -lsql -ftest -i -e --host=volund --port=31436 +# 14:09:56 > + +#START TRANSACTION; +#CREATE TABLE dbg (a INT, b INT); +#INSERT INTO dbg (a,b) VALUES (10,10); +[ 1 ] +#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d; +% sys.dbg, sys.dbg, . # table_name +% d, L3, f # name +% int, bigint, bigint # type +% 2, 2, 2 # length +[ 10, 10, 10 ] +#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d; +% sys.dbg, sys.dbg, . # table_name +% d, e, f # name +% int, bigint, bigint # type +% 2, 2, 2 # length +[ 10, 10, 10 ] + +# 14:09:56 > +# 14:09:56 > Done. +# 14:09:56 > + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
