merge [TRAFODION-3147]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ce62bc52 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ce62bc52 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ce62bc52 Branch: refs/heads/master Commit: ce62bc52d8cfd0fd406b6f85b49de3a108ccb4af Parents: 7677846 9e5b584 Author: Liu Ming <[email protected]> Authored: Mon Jul 30 07:22:26 2018 +0000 Committer: Liu Ming <[email protected]> Committed: Mon Jul 30 07:22:26 2018 +0000 ---------------------------------------------------------------------- core/sql/common/NAString.cpp | 1 + core/sql/common/OperTypeEnum.h | 1 + core/sql/exp/exp_clause.cpp | 2 ++ core/sql/exp/exp_function.cpp | 6 ++++++ core/sql/generator/GenItemFunc.cpp | 1 + core/sql/optimizer/ItemExpr.cpp | 2 ++ core/sql/optimizer/SynthType.cpp | 5 +++++ core/sql/parser/ParKeyWords.cpp | 1 + core/sql/parser/sqlparser.y | 13 +++++++++++-- core/sql/regress/core/EXPECTED037.SB | 7 +++++++ core/sql/regress/core/TEST037 | 4 ++++ core/sql/regress/executor/EXPECTED002.SB | 8 ++++++++ core/sql/regress/executor/FILTER002 | 1 - core/sql/regress/executor/TEST002 | 1 + 14 files changed, 50 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
