Changeset: 6e229768e78d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e229768e78d Modified Files: Branch: Log Message:
Merger the branches diffs (truncated from 2445 to 300 lines): diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/01-22.reqtests --- a/sql/src/benchmarks/tpch/Tests/01-22.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/01-22.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/01.reqtests --- a/sql/src/benchmarks/tpch/Tests/01.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/01.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/02.reqtests --- a/sql/src/benchmarks/tpch/Tests/02.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/02.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/03.reqtests --- a/sql/src/benchmarks/tpch/Tests/03.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/03.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/04.reqtests --- a/sql/src/benchmarks/tpch/Tests/04.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/04.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/05.reqtests --- a/sql/src/benchmarks/tpch/Tests/05.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/05.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/06.reqtests --- a/sql/src/benchmarks/tpch/Tests/06.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/06.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/07.reqtests --- a/sql/src/benchmarks/tpch/Tests/07.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/07.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/08.reqtests --- a/sql/src/benchmarks/tpch/Tests/08.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/08.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/09.reqtests --- a/sql/src/benchmarks/tpch/Tests/09.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/09.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/10.reqtests --- a/sql/src/benchmarks/tpch/Tests/10.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/10.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/11.reqtests --- a/sql/src/benchmarks/tpch/Tests/11.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/11.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/12.reqtests --- a/sql/src/benchmarks/tpch/Tests/12.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/12.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/13.reqtests --- a/sql/src/benchmarks/tpch/Tests/13.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/13.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/14.reqtests --- a/sql/src/benchmarks/tpch/Tests/14.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/14.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/15.reqtests --- a/sql/src/benchmarks/tpch/Tests/15.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/15.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/16.reqtests --- a/sql/src/benchmarks/tpch/Tests/16.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/16.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/17.reqtests --- a/sql/src/benchmarks/tpch/Tests/17.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/17.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/18.reqtests --- a/sql/src/benchmarks/tpch/Tests/18.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/18.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/19.reqtests --- a/sql/src/benchmarks/tpch/Tests/19.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/19.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/20.reqtests --- a/sql/src/benchmarks/tpch/Tests/20.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/20.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/21.reqtests --- a/sql/src/benchmarks/tpch/Tests/21.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/21.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/22.reqtests --- a/sql/src/benchmarks/tpch/Tests/22.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/22.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/All --- a/sql/src/benchmarks/tpch/Tests/All Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/All Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/check0.reqtests --- a/sql/src/benchmarks/tpch/Tests/check0.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/check0.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,2 +1,1 @@ -create_stats create diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/check1.reqtests --- a/sql/src/benchmarks/tpch/Tests/check1.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/check1.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,4 +1,3 @@ -create_stats create check0 load diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/create.reqtests --- a/sql/src/benchmarks/tpch/Tests/create.reqtests Mon May 17 23:02:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -create_stats diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/create_stats.sql.src --- a/sql/src/benchmarks/tpch/Tests/create_stats.sql.src Mon May 17 23:02:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -$RELSRCDIR/../../../sql/stats.sql diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/create_stats.stable.err --- a/sql/src/benchmarks/tpch/Tests/create_stats.stable.err Mon May 17 23:02:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -stderr of test 'create_stats` in directory 'src/benchmarks/tpch` itself: - - -# 08:49:59 > -# 08:49:59 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/Linux-x86_64/lib64/MonetDB:/ufs/niels/scratch/Linux-x86_64/lib64/bin" --set "gdk_dbfarm=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/log" --set mapi_port=30626 --set monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 08:49:59 > - - -# 08:49:59 > -# 08:49:59 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=30626 < create_stats.sql -# 08:49:59 > - - -# 08:49:59 > -# 08:49:59 > Done. -# 08:49:59 > - diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/create_stats.stable.out --- a/sql/src/benchmarks/tpch/Tests/create_stats.stable.out Mon May 17 23:02:42 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -stdout of test 'create_stats` in directory 'src/benchmarks/tpch` itself: - - -# 08:49:59 > -# 08:49:59 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/Linux-x86_64/lib64/MonetDB:/ufs/niels/scratch/Linux-x86_64/lib64/bin" --set "gdk_dbfarm=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/log" --set mapi_port=30626 --set monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 08:49:59 > - -# Monet Database Server V4.13.1 -# Copyright (c) 1993-2006, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. - - -Ready. - -Over.. - -# 08:49:59 > -# 08:49:59 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=30626 < create_stats.sql -# 08:49:59 > - - -# 08:49:59 > -# 08:49:59 > Done. -# 08:49:59 > - diff -r 673b21990071 -r 6e229768e78d sql/src/benchmarks/tpch/Tests/load.reqtests --- a/sql/src/benchmarks/tpch/Tests/load.reqtests Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/benchmarks/tpch/Tests/load.reqtests Mon May 17 23:04:06 2010 +0200 @@ -1,3 +1,2 @@ -create_stats create check0 diff -r 673b21990071 -r 6e229768e78d sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out --- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out Mon May 17 23:04:06 2010 +0200 @@ -25,7 +25,6 @@ # 11:17:13 > mclient -lsql -ftest -i -e --host=alf --port=39432 # 11:17:13 > -TABLE sys.queryhistory TABLE sys.url_test CREATE TABLE "sys"."triggers" ( "id" int, diff -r 673b21990071 -r 6e229768e78d sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out --- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out Mon May 17 23:04:06 2010 +0200 @@ -30,7 +30,6 @@ # 11:17:12 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf --port=39432 -i < /net/alf.ins.cwi.nl/export/scratch1/niels/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql # 11:17:12 > -TABLE sys.queryhistory TABLE sys.url_test CREATE TABLE "sys"."triggers" ( "id" int, diff -r 673b21990071 -r 6e229768e78d sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out --- a/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out Mon May 17 23:02:42 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out Mon May 17 23:04:06 2010 +0200 @@ -37,19 +37,6 @@ _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
