Merge remote branch 'origin/pr/349/head' into merge_trafodion349
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/39d3a0c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/39d3a0c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/39d3a0c4 Branch: refs/heads/master Commit: 39d3a0c44c8ee064fdd43caee311e2a01b7b00bf Parents: cad7ab6 66e03ea Author: Sandhya Sundaresan <[email protected]> Authored: Wed Mar 2 06:36:19 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Wed Mar 2 06:36:19 2016 +0000 ---------------------------------------------------------------------- core/sql/regress/privs2/EXPECTED135 | 329 ----------- core/sql/regress/privs2/EXPECTED142 | 760 +++++++++++++++++++++++++ core/sql/regress/privs2/TEST135 | 43 -- core/sql/regress/privs2/TEST142 | 280 ++++++++++ core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 30 +- core/sql/sqlcomp/PrivMgrDefs.h | 4 +- core/sql/sqlcomp/PrivMgrMD.cpp | 171 ++++-- core/sql/sqlcomp/PrivMgrMD.h | 132 ++++- core/sql/sqlcomp/PrivMgrPrivileges.cpp | 793 ++++++++++++++++----------- core/sql/sqlcomp/PrivMgrPrivileges.h | 48 +- 10 files changed, 1814 insertions(+), 776 deletions(-) ----------------------------------------------------------------------
