Merge branch 'master' of github.com:apache/incubator-trafodion into 
TRAFODION-2034


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

Branch: refs/heads/master
Commit: 3b45ca273990b9803dbe752c5397f0144cc3e48a
Parents: 19cc70c b07378d
Author: Amanda Moran <ama...@apache.com>
Authored: Thu Sep 22 16:54:20 2016 +0000
Committer: Amanda Moran <ama...@apache.com>
Committed: Thu Sep 22 16:54:20 2016 +0000

----------------------------------------------------------------------
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |  118 +-
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile    |    2 +-
 core/dbsecurity/auth/Makefile                   |   24 +-
 core/dbsecurity/auth/depend.mk                  |    8 +-
 core/dbsecurity/auth/inc/authEvents.h           |  107 ++
 core/dbsecurity/auth/inc/dbUserAuth.h           |    2 +
 core/dbsecurity/auth/inc/ld_globals.h           |   48 -
 core/dbsecurity/auth/inc/ldapconfignode.h       |   46 +-
 core/dbsecurity/auth/src/authEvents.cpp         |  176 +++
 core/dbsecurity/auth/src/dbUserAuth.cpp         |  319 ++--
 core/dbsecurity/auth/src/ld_port.cpp            |  201 ---
 core/dbsecurity/auth/src/ldapcheck.cpp          |  465 +++---
 core/dbsecurity/auth/src/ldapconfignode.cpp     |  403 +++---
 core/dbsecurity/macros.gmk                      |    8 +-
 core/sqf/conf/log4cxx.trafodion.auth.config     |   49 +
 .../export/include/common/evl_sqlog_eventnum.h  |    3 +-
 .../hbase/client/transactional/RMInterface.java |   53 +-
 core/sqf/src/tm/tmddlrequests.cpp               |   27 +-
 core/sqf/src/tm/tmddlrequests.h                 |    8 +-
 core/sqf/src/tm/tmtransaction.cpp               |   18 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |    7 +-
 core/sql/executor/ExExeUtilExplain.cpp          |   19 +
 core/sql/executor/ExHbaseIUD.cpp                |   19 +-
 core/sql/executor/HBaseClient_JNI.cpp           |   68 +-
 core/sql/executor/HBaseClient_JNI.h             |   32 +-
 core/sql/exp/ExpHbaseInterface.cpp              |   81 +-
 core/sql/exp/ExpHbaseInterface.h                |   59 +-
 core/sql/generator/GenExplain.cpp               |    8 +
 core/sql/generator/GenPreCode.cpp               |   99 +-
 core/sql/generator/GenRelUpdate.cpp             |   49 +-
 core/sql/optimizer/BindRelExpr.cpp              |   11 +-
 core/sql/optimizer/RelUpdate.h                  |    6 +
 core/sql/regress/charsets/EXPECTED003           |    3 +-
 core/sql/regress/charsets/EXPECTED012           |    4 +-
 core/sql/regress/compGeneral/EXPECTED013.SB     |   11 +-
 core/sql/regress/compGeneral/EXPECTED071        |    4 +
 core/sql/regress/compGeneral/TEST071            |    2 +
 core/sql/regress/core/EXPECTED029.SB            |  105 +-
 core/sql/regress/core/EXPECTED056.SB            |    9 +
 core/sql/regress/core/EXPECTED061.SB            |    8 +-
 core/sql/regress/core/EXPECTED116               |  628 +++++++-
 core/sql/regress/core/EXPECTEDRTS               | 1362 +++++++++---------
 core/sql/regress/core/TEST116                   |  198 +++
 core/sql/regress/executor/EXPECTED013.SB        |   56 +-
 core/sql/regress/executor/EXPECTED014.SB        |   22 +-
 core/sql/regress/executor/EXPECTED016.SB        |   14 +-
 core/sql/regress/executor/EXPECTED122           |    9 +-
 core/sql/regress/executor/EXPECTED131           |   24 +-
 core/sql/regress/executor/EXPECTED140           |   74 +-
 core/sql/regress/executor/TEST140               |    2 +
 core/sql/regress/hive/DIFF003.KNOWN             |   10 +
 core/sql/regress/qat/eqatddl01                  |    3 +
 core/sql/regress/qat/qatddl01                   |    1 +
 core/sql/regress/seabase/EXPECTED010            |  611 ++++----
 core/sql/regress/seabase/EXPECTED011            |   22 +-
 core/sql/regress/seabase/EXPECTED012            |    5 +-
 core/sql/regress/seabase/EXPECTED016            |   56 +-
 core/sql/regress/seabase/EXPECTED020            |   56 +-
 core/sql/regress/seabase/EXPECTED025            |   36 +-
 core/sql/regress/seabase/EXPECTED027            |   85 +-
 core/sql/regress/seabase/EXPECTED031            |   23 +-
 core/sql/regress/seabase/EXPECTED032            |   41 +-
 core/sql/regress/seabase/EXPECTED040            |   11 +
 core/sql/regress/seabase/TEST010                |    2 +
 core/sql/regress/seabase/TEST011                |    1 +
 core/sql/regress/seabase/TEST027                |    1 +
 core/sql/regress/seabase/TEST032                |    4 +
 core/sql/regress/tools/sbdefs                   |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |   24 +
 core/sql/sqlcomp/CmpSeabaseDDLrepos.h           |    6 +-
 core/sql/sqlcomp/DefaultConstants.h             |    4 +
 core/sql/sqlcomp/PrivMgrMDDefs.h                |   32 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    2 +
 .../java/org/trafodion/sql/HBaseClient.java     |   42 +-
 .../java/org/trafodion/sql/HTableClient.java    |  300 ++--
 75 files changed, 3899 insertions(+), 2559 deletions(-)
----------------------------------------------------------------------


Reply via email to