Changeset: d37021f5436a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d37021f5436a Modified Files: sql/test/rdf/Tests/q2_v.sql.timeout sql/test/rdf/Tests/q3_v.sql.timeout sql/test/rdf/Tests/q4_v.sql.timeout sql/test/rdf/Tests/q6_v.sql.timeout sql/test/rdf/Tests/q8_v.sql.timeout Branch: default Log Message:
Merge with Dec2011 branch. diffs (116 lines): diff --git a/sql/backends/monet5/datacell/Tests/All b/sql/backends/monet5/datacell/Tests/All --- a/sql/backends/monet5/datacell/Tests/All +++ b/sql/backends/monet5/datacell/Tests/All @@ -1,17 +1,17 @@ # SQL # (Must be first as otherwise creation of schema datacell via -# 50_datacell.sql is not triggered, as first SQL-clients does not connect +# 50_datacell # on "virgin" database!???) -ENABLE_DATACELL?scenario00.sql -ENABLE_DATACELL?scenario01.sql -ENABLE_DATACELL?scenario02.sql -ENABLE_DATACELL?scenario03.sql -ENABLE_DATACELL?scenario04.sql -ENABLE_DATACELL?scenario05.sql -ENABLE_DATACELL?scenario06.sql -ENABLE_DATACELL?datacell00.sql -ENABLE_DATACELL?dctemper00.sql -ENABLE_DATACELL?linearroad.sql +ENABLE_DATACELL?scenario00 +ENABLE_DATACELL?scenario01 +ENABLE_DATACELL?scenario02 +ENABLE_DATACELL?scenario03 +ENABLE_DATACELL?scenario04 +ENABLE_DATACELL?scenario05 +ENABLE_DATACELL?scenario06 +ENABLE_DATACELL?datacell00 +ENABLE_DATACELL?dctemper00 +ENABLE_DATACELL?linearroad # MAL ENABLE_DATACELL?basket00 ENABLE_DATACELL?receptor00 diff --git a/sql/test/BugTracker-2010/Tests/All b/sql/test/BugTracker-2010/Tests/All --- a/sql/test/BugTracker-2010/Tests/All +++ b/sql/test/BugTracker-2010/Tests/All @@ -86,4 +86,4 @@ call_function_without_warning.Bug-2752 vacuum with-between.Bug-2732 sequence-restart-with-null.Bug-2648 -constants-optimizer.Bug-2317.sql +constants-optimizer.Bug-2317 diff --git a/sql/test/rdf/Tests/All b/sql/test/rdf/Tests/All --- a/sql/test/rdf/Tests/All +++ b/sql/test/rdf/Tests/All @@ -1,28 +1,28 @@ -create_tables_t.sql -create_tables_v.sql* -q1_t.sql -q1_v.sql -q2_28_t.sql -q2_28_v.sql -q2_t.sql -q2_v.sql -q3_28_t.sql -q3_28_v.sql -q3_t.sql -q3_v.sql -q4_28_t.sql -q4_28_v.sql -q4_t.sql -q4_v.sql -q5_t.sql -q5_v.sql -q6_28_t.sql -q6_28_v.sql -q6_t.sql -q6_v.sql -q7_t.sql -q7_v.sql -q8_t.sql -q8_v.sql -drop_tables_t.sql -drop_tables_v.sql +create_tables_t +create_tables_v +q1_t +q1_v +q2_28_t +q2_28_v +q2_t +q2_v +q3_28_t +q3_28_v +q3_t +q3_v +q4_28_t +q4_28_v +q4_t +q4_v +q5_t +q5_v +q6_28_t +q6_28_v +q6_t +q6_v +q7_t +q7_v +q8_t +q8_v +drop_tables_t +drop_tables_v diff --git a/sql/test/rdf/Tests/q2_v.sql.timeout b/sql/test/rdf/Tests/q2_v.timeout rename from sql/test/rdf/Tests/q2_v.sql.timeout rename to sql/test/rdf/Tests/q2_v.timeout diff --git a/sql/test/rdf/Tests/q3_v.sql.timeout b/sql/test/rdf/Tests/q3_v.timeout rename from sql/test/rdf/Tests/q3_v.sql.timeout rename to sql/test/rdf/Tests/q3_v.timeout diff --git a/sql/test/rdf/Tests/q4_v.sql.timeout b/sql/test/rdf/Tests/q4_v.timeout rename from sql/test/rdf/Tests/q4_v.sql.timeout rename to sql/test/rdf/Tests/q4_v.timeout diff --git a/sql/test/rdf/Tests/q6_v.sql.timeout b/sql/test/rdf/Tests/q6_v.timeout rename from sql/test/rdf/Tests/q6_v.sql.timeout rename to sql/test/rdf/Tests/q6_v.timeout diff --git a/sql/test/rdf/Tests/q8_v.sql.timeout b/sql/test/rdf/Tests/q8_v.timeout rename from sql/test/rdf/Tests/q8_v.sql.timeout rename to sql/test/rdf/Tests/q8_v.timeout _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
