Changeset: 5585843d0fcb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5585843d0fcb Modified Files: Branch: default Log Message:
Merge with Dec2011 branch. diffs (166 lines): diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout --- a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout +++ b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout @@ -1,1 +1,1 @@ -16.8 +66 diff --git a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout --- a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout +++ b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout @@ -1,1 +1,1 @@ -16.8 +66 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 @@ -52,3 +52,4 @@ python-connections-Bug.2901 many-connects-cache.Bug-2904 alter-table-set-read-only.bug-2906 predicate.Bug-2908 +history.Bug-2909 diff --git a/sql/test/BugTracker-2011/Tests/history.Bug-2909.sql b/sql/test/BugTracker-2011/Tests/history.Bug-2909.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/history.Bug-2909.sql @@ -0,0 +1,2 @@ +set history = true; +select 1; diff --git a/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.err b/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.err @@ -0,0 +1,37 @@ +stderr of test 'history.Bug-2909` in directory 'test/BugTracker-2011` itself: + + +# 17:31:53 > +# 17:31:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=39058" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0" +# 17:31:53 > + +# 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 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 = 39058 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 17:31:53 > +# 17:31:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=ottar" "--port=39058" +# 17:31:53 > + + +# 17:31:53 > +# 17:31:53 > "Done." +# 17:31:53 > + diff --git a/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.out b/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/history.Bug-2909.stable.out @@ -0,0 +1,56 @@ +stdout of test 'history.Bug-2909` in directory 'test/BugTracker-2011` itself: + + +# 17:31:53 > +# 17:31:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=39058" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0" +# 17:31:53 > + +# MonetDB 5 server v11.5.6 +# 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://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:39058/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 17:31:53 > +# 17:31:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=ottar" "--port=39058" +# 17:31:53 > + +#select 1; +% . # table_name +% single_value # name +% tinyint # type +% 1 # length +[ 1 ] + +# 17:31:53 > +# 17:31:53 > "Done." +# 17:31:53 > + diff --git a/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.sql b/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.sql --- a/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.sql +++ b/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.sql @@ -6,5 +6,5 @@ 1 then cast('VIEW' as varchar(20)) when t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast('' as varchar(1)) as remarks from sys."schemas" s, sys."tables" t where s."id" = -t."schema_id" and t."name" like '%' and (1 = 0 or (t."type" = 0 and t."system" +t."schema_id" and t."name" like 'x%z' and (1 = 0 or (t."type" = 0 and t."system" = false and t."temporary" = 0)) order by table_type, table_schem, table_name; diff --git a/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out b/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out --- a/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out +++ b/sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out @@ -33,12 +33,9 @@ Ready. % ., .s, .t, ., . # table_name % table_cat, table_schem, table_name, table_type, remarks # name % varchar, varchar, varchar, varchar, varchar # type -% 0, 3, 20, 5, 0 # length -[ NULL, "sys", "sensor_readings_2678", "TABLE", "" ] -[ NULL, "sys", "table1_bug2771", "TABLE", "" ] -[ NULL, "sys", "table2_bug2771", "TABLE", "" ] +% 0, 0, 0, 0, 0 # length -# 14:49:53 > -# 14:49:53 > "Done." -# 14:49:53 > +# 17:24:21 > +# 17:24:21 > "Done." +# 17:24:21 > diff --git a/sql/test/rdf/Tests/q8_v.timeout b/sql/test/rdf/Tests/q8_v.timeout --- a/sql/test/rdf/Tests/q8_v.timeout +++ b/sql/test/rdf/Tests/q8_v.timeout @@ -1,1 +1,1 @@ -16.8 +66 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
