Merge branch 'master' of github.com:apache/incubator-trafodion into predicatePushdownV2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7892af2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7892af2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7892af2d Branch: refs/heads/master Commit: 7892af2df84f21d6fc6355d89ec07963cc4f8132 Parents: 9217b39 4550081 Author: Eric Owhadi <[email protected]> Authored: Thu Jan 21 23:32:22 2016 +0000 Committer: Eric Owhadi <[email protected]> Committed: Thu Jan 21 23:32:22 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.h | 2 + core/sql/executor/ExHbaseIUD.cpp | 56 +- core/sql/exp/ExpHbaseInterface.cpp | 38 +- 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/tools/runallsb | 1 - core/sql/regress/tools/runregr_privs1.ksh | 492 +++++++ core/sql/regress/tools/runregr_privs2.ksh | 494 +++++++ core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 27 +- core/sql/sqlcomp/CmpSeabaseDDLauth.h | 1 + core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 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/udrserv/udrserv.cpp | 3 +- .../serverHandler/ServerApiSqlFetch.java | 1 - .../dcs/servermt/serverSql/TrafConnection.java | 2 +- 28 files changed, 1777 insertions(+), 1202 deletions(-) ----------------------------------------------------------------------
