trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lium...@apache.org
Subject [09/15] trafodion git commit: Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-3026
Date Tue, 26 Jun 2018 01:22:41 GMT
Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-3026


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/69433d42
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/69433d42
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/69433d42

Branch: refs/heads/master
Commit: 69433d42d4377fa92ee86681114b5f97ae0182a4
Parents: c0f4373 2e4cb9b
Author: Liu Ming <ovis_poly@sina.com>
Authored: Sat May 19 05:03:43 2018 -0400
Committer: Liu Ming <ovis_poly@sina.com>
Committed: Sat May 19 05:03:43 2018 -0400

----------------------------------------------------------------------
 .../java/org/trafodion/jdbc/t4/Certificate.java |    4 +-
 .../main/java/org/trafodion/jdbc/t4/Cipher.java |    8 +-
 .../main/java/org/trafodion/jdbc/t4/Key.java    |    8 +-
 .../org/trafodion/jdbc/t4/MessageDigest.java    |    2 +-
 .../main/java/org/trafodion/jdbc/t4/SecPwd.java |    2 +-
 .../java/org/trafodion/jdbc/t4/Security.java    |    2 +-
 .../trafodion/jdbc/t4/SecurityException.java    |   11 +-
 core/sqf/macros.gmk                             |    9 +
 core/sqf/src/seabed/src/Makefile                |   20 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54   |    1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55   |    1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57   |    1 +
 .../tm/hbasetmlib2/javaobjectinterfacetm.cpp    |    3 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.h      |    1 +
 core/sqf/src/tm/tmlib.cpp                       |  188 +-
 core/sqf/src/tm/tmlib.h                         |   27 +-
 core/sqf/src/tm/tmtransaction.cpp               |   22 +-
 core/sql/nskgmake/sqlcomp/Makefile              |    1 +
 core/sql/optimizer/GroupAttr.h                  |   15 +-
 core/sql/optimizer/NATable.cpp                  |   15 +-
 core/sql/optimizer/NormRelExpr.cpp              |    2 +
 core/sql/regress/privs1/EXPECTED137             |    7 -
 core/sql/regress/privs1/TEST137                 |    3 -
 core/sql/regress/privs2/EXPECTED146             | 1656 ++++++++++++++++++
 core/sql/regress/privs2/FILTER146               |   38 +
 core/sql/regress/privs2/TEST146                 |  248 +++
 core/sql/regress/seabase/EXPECTED022            |  126 +-
 core/sql/regress/seabase/EXPECTED026            |   25 +-
 core/sql/regress/seabase/TEST022                |   11 +
 core/sql/regress/seabase/TEST026                |    3 +-
 core/sql/regress/seabase/TEST026_drop_hbase     |   26 +
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    2 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |   26 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   10 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  132 +-
 core/sql/sqlcomp/PrivMgr.cpp                    |    9 +
 core/sql/sqlcomp/PrivMgr.h                      |    4 +
 core/sql/sqlcomp/PrivMgrCommands.cpp            |  160 +-
 core/sql/sqlcomp/PrivMgrCommands.h              |  360 +---
 core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp |    6 +
 core/sql/sqlcomp/PrivMgrComponentPrivileges.h   |    4 +-
 core/sql/sqlcomp/PrivMgrUserPrivs.cpp           |  208 +++
 core/sql/sqlcomp/PrivMgrUserPrivs.h             |  400 +++++
 core/sql/ustat/hs_globals.cpp                   |    5 +-
 45 files changed, 3070 insertions(+), 746 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/69433d42/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------


Mime
View raw message