Changeset: 1d7d0e16ce12 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d7d0e16ce12 Branch: default Log Message:
merged diffs (254 lines): diff --git a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test --- a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test +++ b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test @@ -11,20 +11,20 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 +sql.tid +1 sql.bind 4 -sql.tid -1 algebra.likeselect 2 sql.subdelta 1 sql.projectdelta 2 +bat.pack +5 sql.resultSet 1 @@ -35,20 +35,20 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 +sql.tid +1 sql.bind 4 -sql.tid -1 algebra.likeselect 2 sql.subdelta 1 sql.projectdelta 2 +bat.pack +5 sql.resultSet 1 @@ -59,20 +59,20 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 +sql.tid +1 sql.bind 4 -sql.tid -1 algebra.ilikeselect 2 sql.subdelta 1 sql.projectdelta 2 +bat.pack +5 sql.resultSet 1 @@ -83,20 +83,20 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 +sql.tid +1 sql.bind 4 -sql.tid -1 algebra.ilikeselect 2 sql.subdelta 1 sql.projectdelta 2 +bat.pack +5 sql.resultSet 1 diff --git a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.test b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.test --- a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.test +++ b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.test @@ -30,14 +30,14 @@ sql.my_generate_series 2 aggr.count 2 -bat.pack -5 bat.single 2 algebra.crossproduct 1 algebra.projection 2 +bat.pack +5 sql.resultSet 1 diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.test b/sql/test/BugTracker/Tests/explain.SF-1739353.test --- a/sql/test/BugTracker/Tests/explain.SF-1739353.test +++ b/sql/test/BugTracker/Tests/explain.SF-1739353.test @@ -8,20 +8,20 @@ user.main 1 querylog.define 1 -bat.new -1 sql.mvc 1 +sql.tid +2 sql.bind 6 -sql.tid -2 algebra.thetaselect 2 sql.subdelta 1 sql.projectdelta 2 +bat.new +1 bat.append 2 bat.pack diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test @@ -30,13 +30,11 @@ user.main 1 querylog.define 1 -bat.new -1 sql.mvc 1 -sql.bind +sql.tid 2 -sql.tid +sql.bind 2 algebra.thetaselect 2 @@ -46,6 +44,8 @@ aggr.count 2 bat.single 1 +bat.new +1 bat.append 2 aggr.sum diff --git a/sql/test/miscellaneous/Tests/simple_plans.test b/sql/test/miscellaneous/Tests/simple_plans.test --- a/sql/test/miscellaneous/Tests/simple_plans.test +++ b/sql/test/miscellaneous/Tests/simple_plans.test @@ -199,8 +199,6 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 sql.tid @@ -213,6 +211,8 @@ algebra.rangejoin 1 algebra.project 1 +bat.pack +5 sql.resultSet 1 @@ -223,8 +223,6 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 sql.tid @@ -239,6 +237,8 @@ algebra.rangejoin 1 algebra.project 1 +bat.pack +5 sql.resultSet 1 @@ -249,8 +249,6 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 sql.tid @@ -263,6 +261,8 @@ algebra.project 2 algebra.rangejoin 1 +bat.pack +5 sql.resultSet 1 @@ -273,8 +273,6 @@ user.main 1 querylog.define 1 -bat.pack -5 sql.mvc 1 sql.tid @@ -289,6 +287,8 @@ algebra.likejoin 1 algebra.project 1 +bat.pack +5 sql.resultSet 1 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
