Merge remote branch 'origin/pr/1708/head' into merge_1708
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e6e8956c Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e6e8956c Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e6e8956c Branch: refs/heads/master Commit: e6e8956cfff449841f007f3365b60ac079967244 Parents: c7d2301 f85ccaa Author: Sandhya Sundaresan <[email protected]> Authored: Wed Sep 5 20:40:38 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Wed Sep 5 20:40:38 2018 +0000 ---------------------------------------------------------------------- core/sql/executor/ExSequence.cpp | 38 +++++++++++++------------ core/sql/executor/ExSequence.h | 6 ++-- core/sql/executor/ExTranspose.cpp | 39 ++++++++++++------------- core/sql/executor/ExTranspose.h | 6 ++-- core/sql/executor/ex_union.cpp | 41 ++++++++++++++------------- core/sql/executor/ex_union.h | 7 +++-- core/sql/generator/GenRelUpdate.cpp | 2 ++ core/sql/generator/Generator.cpp | 19 +++++++++++-- core/sql/generator/Generator.h | 15 ++++++++++ core/sql/optimizer/Inlining.cpp | 26 +++++++++-------- core/sql/regress/executor/EXPECTED015.SB | 20 ++++++------- core/sql/regress/hive/DIFF005.KNOWN | 5 ++++ core/sql/sqlcomp/DefaultConstants.h | 3 +- core/sql/sqlcomp/nadefaults.cpp | 24 ++++++++-------- 14 files changed, 149 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/e6e8956c/core/sql/sqlcomp/DefaultConstants.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/e6e8956c/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
