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/8e473955 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8e473955 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8e473955 Branch: refs/heads/master Commit: 8e47395571dea1394192d748b7a39036ff171014 Parents: a0b6a55 ff4b7dd Author: Amanda Moran <[email protected]> Authored: Mon Jan 25 18:01:13 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Mon Jan 25 18:01:13 2016 +0000 ---------------------------------------------------------------------- core/dbsecurity/auth/src/dbUserAuth.cpp | 1 + core/sql/common/ComSmallDefs.h | 15 +- core/sql/common/ComUser.h | 6 +- core/sql/common/NAUserId.h | 24 +- core/sql/executor/ExHbaseAccess.cpp | 75 +- core/sql/executor/ExHbaseAccess.h | 2 + core/sql/executor/ExHbaseIUD.cpp | 56 +- core/sql/exp/ExpHbaseInterface.cpp | 38 +- core/sql/generator/GenExplain.cpp | 261 ++++ core/sql/generator/GenPreCode.cpp | 481 +++++- core/sql/generator/GenRelScan.cpp | 3 +- core/sql/optimizer/RelScan.h | 10 + core/sql/optimizer/ValueDesc.cpp | 32 +- core/sql/optimizer/ValueDesc.h | 5 + core/sql/regress/core/EXPECTEDRTS | 1390 +++++++++--------- core/sql/regress/executor/EXPECTED140 | 911 ++++++++++++ core/sql/regress/executor/FILTER140 | 42 + core/sql/regress/executor/TEST140 | 96 ++ core/sql/regress/privs1/EXPECTED137 | 1274 +++++----------- core/sql/regress/privs1/runregr | 31 + core/sql/regress/privs2/EXPECTED135 | 12 +- core/sql/regress/privs2/runregr | 31 + core/sql/regress/seabase/EXPECTED010 | 454 +++--- core/sql/regress/seabase/EXPECTED011 | 22 +- core/sql/regress/seabase/EXPECTED016 | 161 +- core/sql/regress/tools/runallsb | 1 - core/sql/regress/tools/runregr_core.ksh | 2 +- core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/regress/tools/runregr_privs1.ksh | 492 +++++++ core/sql/regress/tools/runregr_privs2.ksh | 494 +++++++ core/sql/regress/tools/sbdefs | 2 +- core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 27 +- core/sql/sqlcomp/CmpSeabaseDDLauth.h | 1 + core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +- core/sql/sqlcomp/DefaultConstants.h | 2 +- core/sql/sqlcomp/PrivMgr.cpp | 12 +- core/sql/sqlcomp/PrivMgrComponentOperations.cpp | 2 +- core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 377 +++-- core/sql/sqlcomp/PrivMgrDefs.h | 9 - core/sql/sqlcomp/PrivMgrMD.cpp | 26 +- core/sql/sqlcomp/PrivMgrMDDefs.h | 4 +- core/sql/sqlcomp/PrivMgrPrivileges.cpp | 28 +- core/sql/sqlcomp/PrivMgrRoles.cpp | 8 +- core/sql/sqlcomp/nadefaults.cpp | 17 + .../java/org/trafodion/sql/HTableClient.java | 571 ++++++- core/sql/udrserv/udrserv.cpp | 3 +- .../dcs/servermt/serverSql/TrafConnection.java | 2 +- 47 files changed, 5260 insertions(+), 2257 deletions(-) ----------------------------------------------------------------------
