You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/02 18:12:58 UTC
[11/13] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f8b82ec6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f8b82ec6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f8b82ec6
Branch: refs/heads/master
Commit: f8b82ec65c83556f602dece8735567096fc6508b
Parents: b516399 7a63602
Author: Amanda Moran <am...@apache.com>
Authored: Mon Feb 1 18:31:09 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Mon Feb 1 18:31:09 2016 +0000
----------------------------------------------------------------------
core/rest/src/main/asciidoc/_chapters/apis.adoc | 20 +-
core/sqf/sql/scripts/sqcheck | 6 +-
.../transactional/TrxRegionEndpoint.java | 201 +-
.../generated/TrxRegionProtos.java | 2092 +++++++++++++++++-
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 16 +
.../java/org/trafodion/dtm/TmAuditTlog.java | 349 ++-
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/optimizer/BindRelExpr.cpp | 17 +-
core/sql/optimizer/BindWA.cpp | 31 +-
core/sql/optimizer/BindWA.h | 5 +-
core/sql/optimizer/NATable.cpp | 7 +-
core/sql/optimizer/NormRelExpr.cpp | 37 +-
core/sql/optimizer/RelExeUtil.cpp | 2 +-
core/sql/optimizer/RelExeUtil.h | 15 +-
core/sql/optimizer/RelExpr.cpp | 1 +
core/sql/optimizer/RelJoin.h | 10 +
core/sql/parser/sqlparser.y | 16 +
core/sql/regress/core/EXPECTED005.SB | 2 +-
core/sql/regress/executor/EXPECTED015.SB | 144 ++
core/sql/regress/executor/TEST015 | 110 +
core/sql/sqlcomp/CmpDescribe.cpp | 8 -
core/sql/sqlcomp/CmpSeabaseDDL.h | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 49 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 11 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 43 -
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/PrivMgr.h | 9 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 4 +-
core/sql/sqlcomp/PrivMgrCommands.h | 2 +-
core/sql/sqlcomp/PrivMgrMD.cpp | 160 +-
core/sql/sqlcomp/PrivMgrMD.h | 6 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 37 +-
core/sql/sqlcomp/nadefaults.cpp | 1 +
core/sql/ustat/hs_const.h | 3 +
core/sql/ustat/hs_globals.cpp | 18 +
core/sql/ustat/hs_lex.ll | 4 +
core/sql/ustat/hs_parser.cpp | 17 +-
core/sql/ustat/hs_yacc.y | 9 +-
.../dcs/servermt/serverSql/TrafConnection.java | 1 +
.../dcs/servermt/serverSql/TrafStatement.java | 1 +
40 files changed, 3154 insertions(+), 315 deletions(-)
----------------------------------------------------------------------