Merge remote branch 'origin/pr/1611/head' into merge_1611
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/fec690de Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/fec690de Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/fec690de Branch: refs/heads/master Commit: fec690deab266614b8903fa5a8fa7fac65b30d7b Parents: 07e94f3 af85718 Author: Sandhya Sundaresan <[email protected]> Authored: Tue Jun 19 18:28:22 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Tue Jun 19 18:28:22 2018 +0000 ---------------------------------------------------------------------- core/sql/cli/Context.cpp | 2 +- core/sql/cli/Statement.cpp | 14 +++++++++++++- core/sql/executor/ex_root.cpp | 4 ++-- core/sql/executor/sql_buffer.cpp | 2 +- core/sql/executor/sql_buffer.h | 4 ++-- core/sql/exp/ExpSqlTupp.h | 14 +++++++------- core/sql/generator/GenRelScan.cpp | 2 +- core/sql/generator/GenRelUpdate.cpp | 4 ++-- core/sql/generator/Generator.cpp | 10 +++++++++- core/sql/generator/Generator.h | 1 + core/sql/sqlcomp/DefaultConstants.h | 12 ++++++++---- core/sql/sqlcomp/nadefaults.cpp | 3 +++ 12 files changed, 50 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
