You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/03/14 21:12:43 UTC
[4/4] incubator-trafodion git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-trafodion into mrg_378
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-trafodion into mrg_378
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/99557ec6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/99557ec6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/99557ec6
Branch: refs/heads/master
Commit: 99557ec6039338a5d2e37885baa3150febef665d
Parents: e122a63 17dbda7
Author: Amanda Moran <am...@apache.org>
Authored: Mon Mar 14 20:08:45 2016 +0000
Committer: Amanda Moran <am...@apache.org>
Committed: Mon Mar 14 20:08:45 2016 +0000
----------------------------------------------------------------------
core/sql/exp/exp_datetime.cpp | 1228 +++++++----------
core/sql/exp/exp_datetime.h | 186 ++-
core/sql/exp/exp_function.cpp | 28 +-
core/sql/generator/GenItemFunc.cpp | 134 +-
core/sql/optimizer/BindItemExpr.cpp | 584 ++++-----
core/sql/optimizer/ItemCache.cpp | 5 +-
core/sql/optimizer/ItemExpr.cpp | 52 +-
core/sql/optimizer/ItemFunc.h | 53 +-
core/sql/optimizer/QRDescGenerator.cpp | 19 +-
core/sql/optimizer/SynthType.cpp | 148 +--
core/sql/parser/ParKeyWords.cpp | 6 +-
core/sql/parser/sqlparser.y | 74 +-
core/sql/regress/compGeneral/DIFF006.KNOWN.SB | 4 -
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006 | 1235 ------------------
core/sql/regress/compGeneral/EXPECTED006.SB | 19 +-
core/sql/regress/compGeneral/TEST006 | 12 +-
core/sql/regress/core/EXPECTED001.SB | 42 +-
core/sql/regress/core/TEST001 | 2 +
core/sql/regress/seabase/EXPECTED030 | 550 ++++++++
core/sql/regress/seabase/TEST030 | 110 ++
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 86 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
23 files changed, 1817 insertions(+), 2768 deletions(-)
----------------------------------------------------------------------