Commits included in testrun 75660:3c09701d3e87

changeset 75646:c5f3e77f9a41
date:2020-07-14 12:01 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:cmake/monetdb-defines.cmake gdk/gdk_utils.c sql/server/rel_optimizer.c sql/server/sql_atom.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/storage/sql_storage.h sql/storage/store.c
message:Merge with oscar branch.
 
changeset 75657:965b3672d9af
date:2020-07-14 15:16 +0200
user:Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
branch:default
files:monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
message:Missed line on approval
 
changeset 75659:2d8a457fdae7
date:2020-07-14 14:43 +0200
user:Niels Nes <niels@cwi.nl>
branch:default
files:sql/storage/store.c
message:small fix for first crash found by hammertime (update member with it parent (merge/replica) in the reset_trans code.
 
changeset 75660:3c09701d3e87
date:2020-07-14 15:54 +0200
user:Niels Nes <niels@cwi.nl>
branch:default
files:
message:merged