Changeset: 5a7db92d535f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a7db92d535f Modified Files: sql/benchmarks/tpch/Tests/check1.timeout sql/test/ADT2006/Tests/viss.timeout sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout sql/test/rdf/Tests/q2_v.timeout sql/test/rdf/Tests/q3_v.timeout sql/test/rdf/Tests/q4_v.timeout sql/test/rdf/Tests/q6_v.timeout Branch: default Log Message:
Merge with Dec2011 branch. diffs (84 lines): diff --git a/sql/benchmarks/tpch/Tests/check1.timeout b/sql/benchmarks/tpch/Tests/check1.timeout deleted file mode 100644 --- a/sql/benchmarks/tpch/Tests/check1.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 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 @@ -66 +99 diff --git a/sql/test/ADT2006/Tests/viss.timeout b/sql/test/ADT2006/Tests/viss.timeout deleted file mode 100644 --- a/sql/test/ADT2006/Tests/viss.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout b/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout deleted file mode 100644 --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 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 @@ -66 +60 diff --git a/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout b/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 diff --git a/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout b/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout --- a/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout +++ b/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout @@ -1,1 +1,1 @@ -3 +4 diff --git a/sql/test/Skyserver/Tests/Skyserver_v6.timeout b/sql/test/Skyserver/Tests/Skyserver_v6.timeout --- a/sql/test/Skyserver/Tests/Skyserver_v6.timeout +++ b/sql/test/Skyserver/Tests/Skyserver_v6.timeout @@ -1,1 +1,1 @@ -16.8 +5 diff --git a/sql/test/VOC/Tests/VOC.timeout b/sql/test/VOC/Tests/VOC.timeout --- a/sql/test/VOC/Tests/VOC.timeout +++ b/sql/test/VOC/Tests/VOC.timeout @@ -1,1 +1,1 @@ -16.8 +3 diff --git a/sql/test/rdf/Tests/q2_v.timeout b/sql/test/rdf/Tests/q2_v.timeout deleted file mode 100644 --- a/sql/test/rdf/Tests/q2_v.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 diff --git a/sql/test/rdf/Tests/q3_v.timeout b/sql/test/rdf/Tests/q3_v.timeout deleted file mode 100644 --- a/sql/test/rdf/Tests/q3_v.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 diff --git a/sql/test/rdf/Tests/q4_v.timeout b/sql/test/rdf/Tests/q4_v.timeout deleted file mode 100644 --- a/sql/test/rdf/Tests/q4_v.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 diff --git a/sql/test/rdf/Tests/q6_v.timeout b/sql/test/rdf/Tests/q6_v.timeout deleted file mode 100644 --- a/sql/test/rdf/Tests/q6_v.timeout +++ /dev/null @@ -1,1 +0,0 @@ -16.8 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 @@ -66 +50 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
