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/18 17:15:00 UTC
[09/13] incubator-trafodion git commit: Merge remote-tracking branch
'origin/master' into TRAFODION-1822
Merge remote-tracking branch 'origin/master' into TRAFODION-1822
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e814f506
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e814f506
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e814f506
Branch: refs/heads/master
Commit: e814f50642e49638720e2145e102e41f7b884ab2
Parents: b19faad 7af82a8
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Wed Feb 17 10:30:26 2016 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Wed Feb 17 10:30:26 2016 -0700
----------------------------------------------------------------------
.gitattributes | 2 -
core/bldenvchk.sh | 2 +-
.../java/org/trafodion/rest/ServerResource.java | 37 +-
.../org/trafodion/rest/VersionResource.java | 25 +-
core/sqf/Makefile | 2 +-
core/sqf/export/lib/Parse/RecDescent.pm | 6009 ------------------
core/sqf/sqenvcom.sh | 5 +-
core/sql/bin/SqlciErrors.txt | 4 +-
core/sql/common/str.cpp | 152 +
core/sql/common/str.h | 3 +
core/sql/executor/ExSequence.cpp | 2 +
core/sql/executor/ExStats.cpp | 24 +-
core/sql/executor/MdamPoint.cpp | 152 +-
core/sql/executor/MdamPoint.h | 5 +-
core/sql/exp/ExpAtp.cpp | 71 +
core/sql/exp/ExpAtp.h | 9 +
core/sql/exp/ExpCriDesc.cpp | 18 +
core/sql/exp/ExpCriDesc.h | 3 +
core/sql/exp/ExpSqlTupp.cpp | 12 +
core/sql/exp/ExpSqlTupp.h | 4 +
core/sql/exp/exp_tuple_desc.cpp | 22 +
core/sql/exp/exp_tuple_desc.h | 3 +
core/sql/optimizer/RelExeUtil.cpp | 7 +
core/sql/parser/SqlParserAux.cpp | 4 +
core/sql/parser/SqlParserAux.h | 1 +
core/sql/parser/StmtDDLCreateRoutine.h | 4 +
core/sql/parser/StmtDDLDropRoutine.h | 5 +
core/sql/parser/sqlparser.y | 88 +-
core/sql/regress/core/EXPECTEDRTS | 1227 ++--
core/sql/regress/hive/EXPECTED009 | 6 +-
core/sql/regress/privs1/EXPECTED133 | 12 +-
core/sql/regress/privs1/EXPECTED141 | Bin 92809 -> 113222 bytes
core/sql/regress/privs2/EXPECTED138 | 84 +-
core/sql/regress/privs2/EXPECTED140 | 324 +-
core/sql/regress/privs2/TEST140 | 2 +-
core/sql/regress/seabase/EXPECTED002 | 146 +-
core/sql/regress/seabase/EXPECTED026 | 34 +-
core/sql/regress/seabase/FILTER002 | 1 +
core/sql/regress/tools/runregr_core.ksh | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 4 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 7 +
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 33 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 11 +
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 10 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 521 +-
core/sql/ustat/hs_cli.cpp | 118 +-
47 files changed, 1844 insertions(+), 7375 deletions(-)
----------------------------------------------------------------------