You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/11/11 17:30:48 UTC
[3/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/165/head' into mrg_79
Merge remote branch 'origin/pr/165/head' into mrg_79
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d62a5981
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d62a5981
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d62a5981
Branch: refs/heads/master
Commit: d62a5981dec126eb2a7dfd3c4d83fa0bf39fc54d
Parents: cce8b85 02cf114
Author: Suresh Subbiah <su...@apache.org>
Authored: Wed Nov 11 16:30:16 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Wed Nov 11 16:30:16 2015 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 6 +--
core/sql/cli/Cli.cpp | 4 +-
core/sql/comexe/ComTdbExeUtil.h | 11 +++--
core/sql/common/CharType.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 9 ++--
core/sql/exp/ExpLOBaccess.cpp | 7 ++-
core/sql/exp/ExpLOBenums.h | 3 +-
core/sql/generator/GenRelExeUtil.cpp | 4 ++
core/sql/generator/GenRelSample.cpp | 15 ++++++-
core/sql/optimizer/BindRelExpr.cpp | 16 ++++++-
core/sql/optimizer/NATable.cpp | 1 -
core/sql/optimizer/RelExeUtil.h | 2 +-
core/sql/optimizer/RelSample.cpp | 1 +
core/sql/parser/sqlparser.y | 22 +++++++++-
core/sql/regress/executor/EXPECTED130 | 32 +++++++-------
core/sql/regress/executor/TEST130 | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 5 ++-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 8 +++-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 64 ++++++++++++++++++++++++++--
19 files changed, 169 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d62a5981/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d62a5981/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d62a5981/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------