You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2016/11/28 16:59:33 UTC
[5/5] incubator-trafodion git commit: Merge remote branch
'apache/master' into mrg-851
Merge remote branch 'apache/master' into mrg-851
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4e7e478f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4e7e478f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4e7e478f
Branch: refs/heads/master
Commit: 4e7e478fea9108b61d05907b7054189d4b420994
Parents: f4e83a3 664a2bb
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Mon Nov 28 16:58:57 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Mon Nov 28 16:58:57 2016 +0000
----------------------------------------------------------------------
core/sql/common/OperTypeEnum.h | 5 +-
core/sql/exp/exp_clause.cpp | 5 +-
core/sql/exp/exp_function.cpp | 82 ++++++++++++++++++++----
core/sql/exp/exp_function.h | 6 +-
core/sql/generator/GenItemFunc.cpp | 25 +++++++-
core/sql/optimizer/BindItemExpr.cpp | 5 +-
core/sql/optimizer/SynthType.cpp | 41 +++++++++++-
core/sql/parser/sqlparser.y | 43 +++++++++++--
core/sql/regress/compGeneral/EXPECTED006.SB | 52 ++++++++++++++-
core/sql/regress/compGeneral/TEST006 | 6 ++
10 files changed, 242 insertions(+), 28 deletions(-)
----------------------------------------------------------------------