Commits included in testrun 66155:1e3453a67fe1

changeset 66148:7a4e0e8d8a30
date:2018-03-23 13:21 +0100
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:clients/mapiclient/mclient.c gdk/gdk.h gdk/gdk_bat.c gdk/gdk_join.c
message:Merge with Mar2018 branch.
 
changeset 66154:581273b0c613
date:2018-03-23 18:28 +0100
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:gdk/gdk_join.c gdk/gdk_select.c sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
message:Merge with Mar2018 branch.
 
changeset 66155:1e3453a67fe1
date:2018-03-23 20:21 +0100
user:Niels Nes <niels@cwi.nl>
branch:default
files:sql/backends/monet5/rel_bin.c sql/rel.txt sql/server/rel_optimizer.c sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
message:fixe bug 6556, ie push conditional code into the batcalc operators