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/8aea73a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8aea73a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8aea73a4 Branch: refs/heads/master Commit: 8aea73a4be305f5794b52c2a61dfff71009fc35e Parents: 71e0036 53d586b Author: Amanda Moran <[email protected]> Authored: Wed Jan 27 22:40:39 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Wed Jan 27 22:40:39 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/install_local_hadoop | 2 +- core/sql/regress/privs1/EXPECTED141 | Bin 78469 -> 92809 bytes core/sql/regress/privs1/TEST141 | 65 +++ core/sql/regress/privs2/EXPECTED135 | 84 ++- core/sql/regress/privs2/EXPECTED140 | 66 ++- core/sql/regress/privs2/TEST135 | 54 +- core/sql/regress/privs2/TEST140 | 13 +- core/sql/regress/tools/runregr_privs1.ksh | 3 - core/sql/regress/tools/runregr_privs2.ksh | 5 - core/sql/sqlcomp/PrivMgrDesc.h | 51 +- core/sql/sqlcomp/PrivMgrMD.cpp | 30 +- core/sql/sqlcomp/PrivMgrMD.h | 9 +- core/sql/sqlcomp/PrivMgrObjects.cpp | 52 ++ core/sql/sqlcomp/PrivMgrObjects.h | 4 + core/sql/sqlcomp/PrivMgrPrivileges.cpp | 685 +++++++++++++++++++------ core/sql/sqlcomp/PrivMgrPrivileges.h | 39 +- core/sql/sqlcomp/PrivMgrRoles.cpp | 1 + 17 files changed, 914 insertions(+), 249 deletions(-) ----------------------------------------------------------------------
